X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=22591088161469d89ef46de72066037c6632a7ab;hp=17d29d0a412a9d5951e51d47d63a046387406a54;hb=9e15e5dbeacc5e038d19a42dcb07d5978bcfd925;hpb=b20f1351704e4e2ae94cb8cee201969f6363dc54 diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py index 17d29d0..2259108 100755 --- a/sql-edition/servers/VendServer.py +++ b/sql-edition/servers/VendServer.py @@ -2,6 +2,7 @@ # vim:ts=4 USE_DB = 0 +USE_MIFARE = 1 import ConfigParser import sys, os, string, re, pwd, signal, math, syslog @@ -17,9 +18,10 @@ from MessageKeeper import MessageKeeper from HorizScroll import HorizScroll from random import random, seed from Idler import GreetingIdler,TrainIdler,GrayIdler,StringIdler,ClockIdler,FortuneIdler,FileIdler,PipeIdler -from SnackConfig import get_snacks, get_snack +from SnackConfig import get_snack#, get_snacks import socket from posix import geteuid +from LDAPConnector import get_uid, set_card_id CREDITS=""" This vending machine software brought to you by: @@ -43,15 +45,18 @@ DOOR = 1 SWITCH = 2 KEY = 3 TICK = 4 +MIFARE = 5 -STATE_IDLE = 1 -STATE_DOOR_OPENING = 2 -STATE_DOOR_CLOSING = 3 -STATE_GETTING_UID = 4 -STATE_GETTING_PIN = 5 -STATE_GET_SELECTION = 6 -STATE_GRANDFATHER_CLOCK = 7 +( +STATE_IDLE, +STATE_DOOR_OPENING, +STATE_DOOR_CLOSING, +STATE_GETTING_UID, +STATE_GETTING_PIN, +STATE_GET_SELECTION, +STATE_GRANDFATHER_CLOCK, +) = range(1,8) TEXT_SPEED = 0.8 IDLE_SPEED = 0.05 @@ -89,18 +94,32 @@ class DispenseDatabase: def scroll_options(username, mk, welcome = False): if welcome: + # Balance checking: crap code, [DAA]'s fault + # Updated 2011 to handle new dispense [MRD] + raw_acct = os.popen('dispense acct %s' % username) + acct = raw_acct.read() + # this is fucking appalling + balance = acct[acct.find("$")+1:acct.find("(")].strip() + raw_acct.close() + msg = [(center('WELCOME'), False, TEXT_SPEED), - (center(username), False, TEXT_SPEED)] + (center(username), False, TEXT_SPEED), + (center(balance), False, TEXT_SPEED),] else: msg = [] choices = ' '*10+'CHOICES: ' - try: - coke_machine = file('/home/other/coke/coke_contents') - cokes = coke_machine.readlines() - coke_machine.close() - except: - cokes = [] - pass + + # Get coke contents + cokes = [] + for i in range(0, 7): + cmd = 'dispense iteminfo coke:%i' % i + raw = os.popen(cmd) + info = raw.read() + raw.close() + m = re.match("\s*[a-z]+:\d+\s+(\d+)\.(\d\d)\s+([^\n]+)", info) + cents = int(m.group(1))*100 + int(m.group(2)) + cokes.append('%i %i %s' % (i, cents, m.group(3))); + for c in cokes: c = c.strip() (slot_num, price, slot_name) = c.split(' ', 2) @@ -124,45 +143,30 @@ def scroll_options(username, mk, welcome = False): msg.append((choices, False, None)) mk.set_messages(msg) -def get_pin(uid): +def get_acct_state(uid): try: info = pwd.getpwuid(uid) except KeyError: logging.info('getting pin for uid %d: user not in password file'%uid) - return None - if info.pw_dir == None: return False - pinfile = os.path.join(info.pw_dir, '.pin') - try: - s = os.stat(pinfile) - except OSError: - logging.info('getting pin for uid %d: .pin not found in home directory'%uid) - return None - if s.st_mode & 077: - logging.info('getting pin for uid %d: .pin has wrong permissions. Fixing.'%uid) - os.chmod(pinfile, 0600) - try: - f = file(pinfile) - except IOError: - logging.info('getting pin for uid %d: I cannot read pin file'%uid) - return None - pinstr = f.readline() - f.close() - if not re.search('^'+'[0-9]'*PIN_LENGTH+'$', pinstr): - logging.info('getting pin for uid %d: %s not a good pin'%(uid,repr(pinstr))) - return None - return int(pinstr) + return 'invalid' + ret = os.system('dispense acct %s' % (info.pw_name)) + if ret != 0: + return 'invalid' -def has_good_pin(uid): - return get_pin(uid) != None + # TODO: Disabled account check (done in server pin check now) -def verify_user_pin(uid, pin): - if get_pin(uid) == pin: - info = pwd.getpwuid(uid) - logging.info('accepted pin for uid %d (%s)'%(uid,info.pw_name)) - return info.pw_name - else: + return 'good' + +def verify_user_pin(uid, pin, skip_pin_check=False): + info = pwd.getpwuid(uid) + if skip_pin_check: + logging.info('accepted mifare for uid %d (%s)'%(uid,info.pw_name)) + elif os.system('dispense pincheck %04i %s' % (pin, info.pw_name)) != 0: logging.info('refused pin for uid %d'%(uid)) return None + else: + logging.info('accepted pin for uid %d (%s)'%(uid,info.pw_name)) + return info.pw_name def cookie(v): @@ -375,10 +379,17 @@ def handle_get_selection_key(state, event, params, v, vstatus): return else: vstatus.cur_selection += chr(key + ord('0')) - make_selection(v,vstatus) - vstatus.cur_selection = '' - vstatus.time_to_autologout = time() + 8 - vstatus.last_timeout_refresh = None + if vstatus.cur_user: + make_selection(v,vstatus) + vstatus.cur_selection = '' + vstatus.time_to_autologout = time() + 8 + vstatus.last_timeout_refresh = None + else: + # Price check mode. + price_check(v,vstatus) + vstatus.cur_selection = '' + vstatus.time_to_autologout = None + vstatus.last_timeout_refresh = None def make_selection(v, vstatus): # should use sudo here @@ -386,7 +397,8 @@ def make_selection(v, vstatus): vstatus.mk.set_message('OPENSESAME') logging.info('dispensing a door for %s'%vstatus.username) if geteuid() == 0: - ret = os.system('su - "%s" -c "dispense door"'%vstatus.username) + #ret = os.system('su - "%s" -c "dispense door"'%vstatus.username) + ret = os.system('dispense -u "%s" door'%vstatus.username) else: ret = os.system('dispense door') if ret == 0: @@ -404,10 +416,11 @@ def make_selection(v, vstatus): return elif vstatus.cur_selection[1] == '8': v.display('GOT DRINK?') - if ((os.system('su - "%s" -c "dispense %s"'%(vstatus.username, vstatus.cur_selection[0])) >> 8) != 0): + if ((os.system('dispense -u "%s" coke:%s'%(vstatus.username, vstatus.cur_selection[0])) >> 8) != 0): v.display('SEEMS NOT') else: v.display('GOT DRINK!') + #v.display('SEE FRIDGE') else: # first see if it's a named slot try: @@ -416,18 +429,39 @@ def make_selection(v, vstatus): price, shortname, name = get_snack( '--' ) dollarprice = "$%.2f" % ( price / 100.0 ) v.display(vstatus.cur_selection+' - %s'%dollarprice) - exitcode = os.system('su - "%s" -c "dispense give oday %d"'%(vstatus.username, price)) >> 8 +# exitcode = os.system('dispense -u "%s" give \>sales\:snack %d "%s"'%(vstatus.username, price, name)) >> 8 + # For some reason, this causes the machine and this code to desync + exitcode = os.system('dispense -u "%s" snack:%s'%(vstatus.username, vstatus.cur_selection)) >> 8 if (exitcode == 0): # magic dispense syslog service syslog.syslog(syslog.LOG_INFO | syslog.LOG_LOCAL4, "vended %s (slot %s) for %s" % (name, vstatus.cur_selection, vstatus.username)) v.vend(vstatus.cur_selection) v.display('THANK YOU') + elif (exitcode == 5): # RV_BALANCE + v.display('NO MONEY?') + elif (exitcode == 4): # RV_ARGUMENTS (zero give causes arguments) + v.display('EMPTY SLOT') + elif (exitcode == 1): # RV_BADITEM (Dead slot) + v.display('EMPTY SLOT') else: syslog.syslog(syslog.LOG_INFO | syslog.LOG_LOCAL4, "failed vending %s (slot %s) for %s (code %d)" % (name, vstatus.cur_selection, vstatus.username, exitcode)) - v.display('NO MONEY?') + v.display('UNK ERROR') sleep(1) +def price_check(v, vstatus): + if vstatus.cur_selection[1] == '8': + v.display(center('SEE COKE')) + else: + # first see if it's a named slot + try: + price, shortname, name = get_snack( vstatus.cur_selection ) + except: + price, shortname, name = get_snack( '--' ) + dollarprice = "$%.2f" % ( price / 100.0 ) + v.display(vstatus.cur_selection+' - %s'%dollarprice) + + def handle_getting_pin_key(state, event, params, v, vstatus): #print "handle_getting_pin_key (s,e,p)", state, " ", event, " ", params key = params @@ -470,7 +504,14 @@ def handle_getting_uid_key(state, event, params, v, vstatus): # complicated key handling here: - + if len(vstatus.cur_user) == 0 and key == 9: + vstatus.cur_selection = '' + vstatus.time_to_autologout = None + vstatus.mk.set_message('PRICECHECK') + sleep(0.5) + scroll_options('', vstatus.mk) + vstatus.change_state(STATE_GET_SELECTION) + return if len(vstatus.cur_user) <8: if key == 11: @@ -485,45 +526,9 @@ def handle_getting_uid_key(state, event, params, v, vstatus): else: vstatus.mk.set_message('UID: '+vstatus.cur_user) - - # Easter egg for nikita's birthday -- DGB - if len(vstatus.cur_user) == 8: - if vstatus.cur_user != "07051980": - vstatus.mk.set_messages( - [(' '*9+'ONE MORE TRY NiKiTa'+' '*10, False, 3)]) - vstatus.cur_user = '' - reset_idler(v, vstatus, 3) - return - - # Do stuff here - vstatus.mk.set_messages( - [(center(' GUILD MAILBOX NUMBER 64 '), False, 20), - (center(' GUILD MAILBOX NUMBER 64 '), False, 20), - (center(' GUILD MAILBOX NUMBER 64 '), False, 20), - (center(' GUILD MAILBOX NUMBER 64 '), False, 20)]) - - # Reset - vstatus.cur_user = '' - vstatus.cur_pin = '' - #reset_idler(v, vstatus, 10) - reset_idler(v, vstatus, 2) - return - # End easter egg part 1 if len(vstatus.cur_user) == 5: uid = int(vstatus.cur_user) - # Easter egg for nikita's birthday -- DGB - if vstatus.cur_user == '07051': - if key == 11: - vstatus.cur_user = '' - reset_idler(v, vstatus) - return -# vstatus.cur_user += chr(key + ord('0')) - logging.info(' == 5 dob: '+vstatus.cur_user) - vstatus.mk.set_message('>'+vstatus.cur_user) - return - # end easter egg part 2 - if uid == 0: logging.info('user '+vstatus.cur_user+' has a bad PIN') pfalken=""" @@ -564,23 +569,40 @@ Wouldn't you prefer a nice game of chess? return - if not has_good_pin(uid): - logging.info('user '+vstatus.cur_user+' has a bad PIN') + acct_state = get_acct_state(uid) + if acct_state == 'invalid': + logging.info('user '+vstatus.cur_user+' is not in the database') + vstatus.mk.set_messages( + [(' '*10+'INVALID PIN SETUP'+' '*11, False, 3)]) + vstatus.cur_user = '' + vstatus.cur_pin = '' + + reset_idler(v, vstatus, 3) + return + elif acct_state == 'locked': + logging.info('user '+vstatus.cur_user+' is locked') + vstatus.mk.set_messages( + [(' '*10+'INVALID PIN SETUP'+' '*11, False, 3)]) + vstatus.cur_user = '' + vstatus.cur_pin = '' + + reset_idler(v, vstatus, 3) + return + elif acct_state == 'good': + vstatus.cur_pin = '' + vstatus.mk.set_message('PIN: ') + logging.info('need pin for user %s'%vstatus.cur_user) + vstatus.change_state(STATE_GETTING_PIN) + return + else: + logging.error('user '+vstatus.cur_user+' has an unknown account state'+acct_state) vstatus.mk.set_messages( [(' '*10+'INVALID PIN SETUP'+' '*11, False, 3)]) vstatus.cur_user = '' vstatus.cur_pin = '' reset_idler(v, vstatus, 3) - return - - - vstatus.cur_pin = '' - vstatus.mk.set_message('PIN: ') - logging.info('need pin for user %s'%vstatus.cur_user) - vstatus.change_state(STATE_GETTING_PIN) - return def handle_idle_key(state, event, params, v, vstatus): @@ -719,8 +741,24 @@ def handle_grandfather_tick(state, event, params, v, vstatus): vstatus.change_state(STATE_IDLE,1) def handle_door_idle(state, event, params, v, vstatus): + def twiddle(clock,v,wise = 2): + if (clock % 4 == 0): + v.display("-FEED ME-") + elif (clock % 4 == 1+wise): + v.display("\\FEED ME/") + elif (clock % 4 == 2): + v.display("-FEED ME-") + elif (clock % 4 == 3-wise): + v.display("/FEED ME\\") + # don't care right now. - pass + now = int(time()) + + if ((now % 60 % 2) == 0): + twiddle(now, v) + else: + twiddle(now, v, wise=0) + def handle_door_event(state, event, params, v, vstatus): if params == 0: #door open @@ -737,6 +775,62 @@ def handle_door_event(state, event, params, v, vstatus): logging.warning('Leaving open door mode') v.display("-YUM YUM!-") +def handle_mifare_event(state, event, params, v, vstatus): + card_id = params + # Translate card_id into uid. + if card_id == None: + return + + try: + vstatus.cur_user = get_uid(card_id) + logging.info('Mapped card id to uid %s'%vstatus.cur_user) + vstatus.username = verify_user_pin(int(vstatus.cur_user), None, True) + except ValueError: + vstatus.username = None + + if vstatus.username: + v.beep(0, False) + vstatus.cur_selection = '' + vstatus.change_state(STATE_GET_SELECTION) + scroll_options(vstatus.username, vstatus.mk, True) + return + else: + v.beep(40, False) + vstatus.mk.set_messages( + [(center('BAD CARD'), False, 1.0), + (center('SORRY'), False, 0.5)]) + vstatus.cur_user = '' + vstatus.cur_pin = '' + + reset_idler(v, vstatus, 2) + return + +def handle_mifare_add_user_event(state, event, params, v, vstatus): + card_id = params + + # Translate card_id into uid. + if card_id == None: + return + + try: + if get_uid(card_id) != None: + vstatus.mk.set_messages( + [(center('ALREADY'), False, 0.5), + (center('ENROLLED'), False, 0.5)]) + + # scroll_options(vstatus.username, vstatus.mk) + return + except ValueError: + pass + + logging.info('Enrolling card %s to uid %s (%s)'%(card_id, vstatus.cur_user, vstatus.username)) + set_card_id(vstatus.cur_user, card_id) + vstatus.mk.set_messages( + [(center('CARD'), False, 0.5), + (center('ENROLLED'), False, 0.5)]) + + # scroll_options(vstatus.username, vstatus.mk) + def return_to_idle(state,event,params,v,vstatus): reset_idler(v, vstatus) @@ -744,26 +838,32 @@ def create_state_table(vstatus): vstatus.state_table[(STATE_IDLE,TICK,1)] = handle_idle_tick vstatus.state_table[(STATE_IDLE,KEY,1)] = handle_idle_key vstatus.state_table[(STATE_IDLE,DOOR,1)] = handle_door_event + vstatus.state_table[(STATE_IDLE,MIFARE,1)] = handle_mifare_event vstatus.state_table[(STATE_DOOR_OPENING,TICK,1)] = handle_door_idle vstatus.state_table[(STATE_DOOR_OPENING,DOOR,1)] = handle_door_event vstatus.state_table[(STATE_DOOR_OPENING,KEY,1)] = do_nothing + vstatus.state_table[(STATE_DOOR_OPENING,MIFARE,1)] = do_nothing vstatus.state_table[(STATE_DOOR_CLOSING,TICK,1)] = return_to_idle vstatus.state_table[(STATE_DOOR_CLOSING,DOOR,1)] = handle_door_event vstatus.state_table[(STATE_DOOR_CLOSING,KEY,1)] = do_nothing + vstatus.state_table[(STATE_DOOR_CLOSING,MIFARE,1)] = do_nothing vstatus.state_table[(STATE_GETTING_UID,TICK,1)] = handle_getting_uid_idle vstatus.state_table[(STATE_GETTING_UID,DOOR,1)] = do_nothing vstatus.state_table[(STATE_GETTING_UID,KEY,1)] = handle_getting_uid_key + vstatus.state_table[(STATE_GETTING_UID,MIFARE,1)] = handle_mifare_event vstatus.state_table[(STATE_GETTING_PIN,TICK,1)] = handle_getting_pin_idle vstatus.state_table[(STATE_GETTING_PIN,DOOR,1)] = do_nothing vstatus.state_table[(STATE_GETTING_PIN,KEY,1)] = handle_getting_pin_key + vstatus.state_table[(STATE_GETTING_PIN,MIFARE,1)] = handle_mifare_event vstatus.state_table[(STATE_GET_SELECTION,TICK,1)] = handle_get_selection_idle vstatus.state_table[(STATE_GET_SELECTION,DOOR,1)] = do_nothing vstatus.state_table[(STATE_GET_SELECTION,KEY,1)] = handle_get_selection_key + vstatus.state_table[(STATE_GET_SELECTION,MIFARE,1)] = handle_mifare_add_user_event vstatus.state_table[(STATE_GRANDFATHER_CLOCK,TICK,1)] = handle_idle_grandfather_tick vstatus.state_table[(STATE_GRANDFATHER_CLOCK,TICK,2)] = handle_grandfather_tick @@ -771,6 +871,7 @@ def create_state_table(vstatus): vstatus.state_table[(STATE_GRANDFATHER_CLOCK,DOOR,2)] = do_nothing vstatus.state_table[(STATE_GRANDFATHER_CLOCK,KEY,1)] = do_nothing vstatus.state_table[(STATE_GRANDFATHER_CLOCK,KEY,2)] = do_nothing + vstatus.state_table[(STATE_GRANDFATHER_CLOCK,MIFARE,1)] = handle_mifare_event def get_state_table_handler(vstatus, state, event, counter): return vstatus.state_table[(state,event,counter)] @@ -784,7 +885,7 @@ def time_to_next_update(vstatus): return idle_update def run_forever(rfh, wfh, options, cf): - v = VendingMachine(rfh, wfh) + v = VendingMachine(rfh, wfh, USE_MIFARE) vstatus = VendState(v) create_state_table(vstatus) @@ -813,7 +914,6 @@ def run_forever(rfh, wfh, options, cf): except DispenseDatabaseException, e: logging.error('Database error: '+str(e)) - timeout = time_to_next_update(vstatus) e = v.next_event(timeout) (event, params) = e @@ -847,6 +947,8 @@ def connect_to_vend(options, cf): sock.connect((options.host, options.port)) rfh = sock.makefile('r') wfh = sock.makefile('w') + global USE_MIFARE + USE_MIFARE = 0 return rfh, wfh @@ -854,7 +956,7 @@ def parse_args(): from optparse import OptionParser op = OptionParser(usage="%prog [OPTION]...") - op.add_option('-f', '--config-file', default='/etc/dispense/servers.conf', metavar='FILE', dest='config_file', help='use the specified config file instead of /etc/dispense/servers.conf') + op.add_option('-f', '--config-file', default='/etc/dispense2/servers.conf', metavar='FILE', dest='config_file', help='use the specified config file instead of /etc/dispense/servers.conf') op.add_option('--serial', action='store_true', default=True, dest='use_serial', help='use the serial port') op.add_option('--lat', action='store_true', default=False, dest='use_lat', help='use LAT') op.add_option('--virtualvend', action='store_false', default=True, dest='use_serial', help='use the virtual vending server instead of LAT') @@ -985,6 +1087,8 @@ def do_vend_server(options, config_opts): sleep(5) continue +# run_forever(rfh, wfh, options, config_opts) + try: run_forever(rfh, wfh, options, config_opts) except VendingException: