X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=VendServer%2FOpenDispense.py;h=c8dcf836d36b8bfb5f8ac164a8825598bb746345;hp=b4f481c54dd80b677a3212961363c94bf7c01da5;hb=8861a669b4611e2dbf7aa5354f0248aafba3ef91;hpb=a0c785ac1d572b82cb214a61e62d8443b3927e7c

diff --git a/VendServer/OpenDispense.py b/VendServer/OpenDispense.py
index b4f481c..c8dcf83 100644
--- a/VendServer/OpenDispense.py
+++ b/VendServer/OpenDispense.py
@@ -9,11 +9,17 @@ Documentation for this code can be found inder Dispence.DispenceInterface
 
 from DispenseInterface import DispenseInterface
 import os
+import logging
 import re
 import pwd
+import base64
+import socket
 from subprocess import Popen, PIPE
 from LDAPConnector import get_uid,get_uname, set_card_id
 
+DISPENSE_ENDPOINT = ("localhost", 11020)
+DISPSRV_MIFARE = True
+
 class OpenDispense(DispenseInterface):
 	_username = ""
 	_disabled = True
@@ -24,6 +30,8 @@ class OpenDispense(DispenseInterface):
 		pass
 
 	def authUserIdPin(self, userId, pin):
+		userId = int(userId)
+
 		try:
 			# Get info from 
 			info = pwd.getpwuid(userId)
@@ -64,27 +72,77 @@ class OpenDispense(DispenseInterface):
 		return False
 
 	def authMifareCard(self, cardId):
-		# Get the users ID
-		self._userid = get_uid(cardId)
+		if DISPSRV_MIFARE:
+			card_base64 = base64.b64encode(cardId)
+			
+			sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0)
+			sock.connect(DISPENSE_ENDPOINT)
+			logging.debug('connected to dispsrv')
+			sockf = sock.makefile()
+			sockf.write("AUTHIDENT\n"); sockf.flush()
+			rsp = sockf.readline()
+			assert "200" in rsp
+			logging.debug('authenticated')
+			sockf.write("AUTHCARD %s\n" % (card_base64,)); sockf.flush()
+			rsp = sockf.readline()
+			if not "200" in rsp:
+				raise ValueError, "no UID found for card ID"
+			username = rsp.split('=')[1].strip()
+
+			# Check for thier username
+			try:
+				# Get info from the system (by username)
+				info = pwd.getpwnam(username)
+			except KeyError:
+				logging.info('getting info for user \'%s\': user not in password file' % (username,))
+				return False
+		else:
+			# Get the users ID
+			self._userid = get_uid(cardId)
 
-		# Check for thier username
-		try:
-			# Get info from 
-			info = pwd.getpwuid(userId)
-		except KeyError:
-			logging.info('getting pin for uid %d: user not in password file'%uid)
-			return False
+			# Check for thier username
+			try:
+				# Get info from the system (by UID)
+				info = pwd.getpwuid(self._userid)
+			except KeyError:
+				logging.info('getting info for uid %d: user not in password file' % (self._userid,))
+				return False
 
 		# If we get this far all is good
 		self._loggedIn = True
 		self._disabled = False
+		self._userid = info.pw_uid
 		self._username = info.pw_name
 		return True
 
 	def addCard(self, cardId):
-		if self.isLoggedIn():
-			set_card_id(self._userId, cardId)
-		return True
+		if not self.isLoggedIn():
+			return False
+		if DISPSRV_MIFARE:
+			card_base64 = base64.b64encode(cardId)
+			logging.info('Enrolling card %s to uid %s (%s)' % (cardId, self._userId, self._username))
+			sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0)
+			sock.connect(DISPENSE_ENDPOINT)
+			sockf = sock.makefile()
+			sockf.write("AUTHIDENT\n")
+			sockf.flush(); rsp = sockf.readline()
+			assert "200" in rsp
+			sockf.write("SETEUSER %s\n", self._username)
+			sockf.flush(); rsp = sockf.readline()
+			assert "200" in rsp
+			sockf.write("CARD_ADD %s\n", card_base64)
+			sockf.flush(); rsp = sockf.readline()
+			if "200" in rsp:
+				return True
+			else:
+				return False
+		else:
+			if get_uid(cardId) != None:
+				return False
+			else:
+				logging.info('Enrolling card %s to uid %s (%s)' % (cardId, self._userId, self._username))
+				set_card_id(self._userId, cardId)
+				return True
 
 	def isLoggedIn(self):
 		return self._loggedIn
@@ -102,6 +160,7 @@ class OpenDispense(DispenseInterface):
 		return balance
 
 	def getItemInfo(self, itemId):
+		logging.debug("getItemInfo(%s)" % (itemId,))
 		itemId = OpenDispenseMapping.vendingMachineToOpenDispense(itemId)
 		args = ('dispense', 'iteminfo', itemId)
 		info, unused = Popen(args, close_fds=True, stdout=PIPE).communicate()
@@ -138,8 +197,20 @@ class OpenDispenseMapping():
 
 	@staticmethod
 	def vendingMachineToOpenDispense(itemId):
+		logging.debug("vendingMachineToOpenDispense(%s)" % (itemId,))
 		_mappingFile = "OpenDispenseMappings.conf"
-		fh = open(_mappingFile)
+		try:
+			fh = open(_mappingFile)
+		except IOError:
+			if itemId[1] == '8':
+				return 'coke:' + itemId[0]
+			elif itemId[1] == '5':
+				if itemId[0] == '5':
+					return 'door'
+				else:
+					return None
+			else:
+				return 'snack:' + itemId
 		map = ""
 		for line in fh:
 			#line = line.strip()