raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix authentication error processing

Browse Source
This commit is contained in:
Ken Roberts 2014-10-13 09:40:58 -07:00
parent 498ecb5b6a
commit e7e53501df
1 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
openlp/core/lib/projector/pjlink1.py
View File

@ -143,6 +143,7 @@ class PJLink1(QTcpSocket):
'INST': self.process_inst, 'INST': self.process_inst,
'LAMP': self.process_lamp, 'LAMP': self.process_lamp,
'NAME': self.process_name, 'NAME': self.process_name,
'PJLINK': self.check_login,
'POWR': self.process_powr 'POWR': self.process_powr
} }
@ -157,7 +158,8 @@ class PJLink1(QTcpSocket):
self.fan = None self.fan = None
self.source_available = None self.source_available = None
self.source = None self.source = None
self.projector_errors = None if hasattr(self, 'timer'):
self.timer.stop()
def thread_started(self): def thread_started(self):
""" """
@ -192,10 +194,16 @@ class PJLink1(QTcpSocket):
# Reset timer in case we were called from a set command # Reset timer in case we were called from a set command
self.timer.start() self.timer.start()
for command in ['POWR', 'ERST', 'LAMP', 'AVMT', 'INPT']: for command in ['POWR', 'ERST', 'LAMP', 'AVMT', 'INPT']:
# Changeable information
self.send_command(command) self.send_command(command)
self.waitForReadyRead() self.waitForReadyRead()
if self.power == S_ON and self.source_available is None: if self.power == S_ON and self.source_available is None:
self.send_command('INST') self.send_command('INST')
if self.manufacturer is None:
for command in ['INF1', 'INF2', 'INFO', 'NAME', 'INST']:
log.debug('(%s) Updating %s information' % (self.ip, command))
self.send_command(cmd=command)
self.waitForReadyRead()
def _get_status(self, status): def _get_status(self, status):
""" """
@ -265,27 +273,25 @@ class PJLink1(QTcpSocket):
if not data.upper().startswith('PJLINK'): if not data.upper().startswith('PJLINK'):
# Invalid response # Invalid response
return self.disconnect_from_host() return self.disconnect_from_host()
data_check = data.strip().split(' ') if '=' in data:
data_check = data.strip().split('=')
else:
data_check = data.strip().split(' ')
log.debug('(%s) data_check="%s"' % (self.ip, data_check)) log.debug('(%s) data_check="%s"' % (self.ip, data_check))
salt = None
# PJLink initial login will be: # PJLink initial login will be:
# 'PJLink 0' - Unauthenticated login - no extra steps required. # 'PJLink 0' - Unauthenticated login - no extra steps required.
# 'PJLink 1 XXXXXX' Authenticated login - extra processing required. # 'PJLink 1 XXXXXX' Authenticated login - extra processing required.
if data_check[1] == '1': if data_check[1] == '1':
# Authenticated login with salt # Authenticated login with salt
salt = qmd5_hash(salt=data_check[2], data=self.pin) salt = qmd5_hash(salt=data_check[2], data=self.pin)
else:
salt = None
# We're connected at this point, so go ahead and do regular I/O # We're connected at this point, so go ahead and do regular I/O
self.readyRead.connect(self.get_data) self.readyRead.connect(self.get_data)
# Initial data we should know about # Initial data we should know about
self.send_command(cmd='CLSS', salt=salt) self.send_command(cmd='CLSS', salt=salt)
self.waitForReadyRead() self.waitForReadyRead()
# These should never change once we get this information if not self.new_wizard and self.state() == self.ConnectedState:
if self.manufacturer is None:
for command in ['INF1', 'INF2', 'INFO', 'NAME', 'INST']:
self.send_command(cmd=command)
self.waitForReadyRead()
self.change_status(S_CONNECTED)
if not self.new_wizard:
self.timer.start() self.timer.start()
self.poll_loop() self.poll_loop()
@ -313,9 +319,7 @@ class PJLink1(QTcpSocket):
if data.upper().startswith('PJLINK'): if data.upper().startswith('PJLINK'):
# Reconnected from remote host disconnect ? # Reconnected from remote host disconnect ?
return self.check_login(data) return self.check_login(data)
if '=' in data: if not '=' in data:
pass
else:
log.warn('(%s) Invalid packet received' % self.ip) log.warn('(%s) Invalid packet received' % self.ip)
return return
data_split = data.split('=') data_split = data.split('=')
@ -339,7 +343,7 @@ class PJLink1(QTcpSocket):
""" """
log.debug('(%s) get_error(err=%s): %s' % (self.ip, err, self.errorString())) log.debug('(%s) get_error(err=%s): %s' % (self.ip, err, self.errorString()))
if err <= 18: if err <= 18:
# QSocket errors. Redefined in projectorconstants so we don't mistake # QSocket errors. Redefined in projector.constants so we don't mistake
# them for system errors # them for system errors
check = err + E_CONNECTION_REFUSED check = err + E_CONNECTION_REFUSED
self.timer.stop() self.timer.stop()
@ -368,13 +372,17 @@ class PJLink1(QTcpSocket):
out = '%s%s %s%s' % (PJLINK_HEADER, cmd, opts, CR) out = '%s%s %s%s' % (PJLINK_HEADER, cmd, opts, CR)
else: else:
out = '%s%s %s%s' % (salt, cmd, opts, CR) out = '%s%s %s%s' % (salt, cmd, opts, CR)
sent = self.write(out) try:
self.waitForBytesWritten(5000) # 5 seconds should be enough sent = self.write(out)
if sent == -1: self.waitForBytesWritten(2000) # 2 seconds should be enough
# Network error?
self.projectorNetwork.emit(S_NETWORK_RECEIVED) self.projectorNetwork.emit(S_NETWORK_RECEIVED)
self.change_status(E_NETWORK, if sent == -1:
translate('OpenLP.PJLink1', 'Error while sending data to projector')) # Network error?
self.change_status(E_NETWORK,
translate('OpenLP.PJLink1', 'Error while sending data to projector'))
except SocketError as e:
self.disconnect_from_host()
self.changeStatus(E_NETWORK, '%s : %s' % (e.error(), e.errorString()))
def process_command(self, cmd, data): def process_command(self, cmd, data):
""" """
@ -385,6 +393,7 @@ class PJLink1(QTcpSocket):
# Oops - projector error # Oops - projector error
if data.upper() == 'ERRA': if data.upper() == 'ERRA':
# Authentication error # Authentication error
self.disconnect_from_host()
self.change_status(E_AUTHENTICATION) self.change_status(E_AUTHENTICATION)
return return
elif data.upper() == 'ERR1': elif data.upper() == 'ERR1':
@ -573,7 +582,7 @@ class PJLink1(QTcpSocket):
except TypeError: except TypeError:
pass pass
self.change_status(S_NOT_CONNECTED) self.change_status(S_NOT_CONNECTED)
self.timer.stop() self.reset_information()
def get_available_inputs(self): def get_available_inputs(self):
""" """