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

Fix authentication errors

This commit is contained in:
Ken Roberts 2014-10-13 13:16:25 -07:00
parent 5938ccc9a6
commit 713a255241
2 changed files with 70 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,8 @@ class PJLink1(QTcpSocket):
changeStatus = pyqtSignal(str, int, str) changeStatus = pyqtSignal(str, int, str)
projectorNetwork = pyqtSignal(int) # Projector network activity projectorNetwork = pyqtSignal(int) # Projector network activity
projectorStatus = pyqtSignal(int) projectorStatus = pyqtSignal(int)
projectorAuthentication = pyqtSignal(str) # Authentication error - str=self.name projectorAuthentication = pyqtSignal(str) # Authentication error
projectorNoAuthentication = pyqtSignal(str) # PIN set and no authentication needed
def __init__(self, name=None, ip=None, port=PJLINK_PORT, pin=None, *args, **kwargs): def __init__(self, name=None, ip=None, port=PJLINK_PORT, pin=None, *args, **kwargs):
""" """
@ -200,11 +201,19 @@ class PJLink1(QTcpSocket):
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')
self.waitForReadyRead()
if self.manufacturer is None: if self.manufacturer is None:
for command in ['INF1', 'INF2', 'INFO', 'NAME', 'INST']: self.send_command('INF1')
log.debug('(%s) Updating %s information' % (self.ip, command)) self.waitForReadyRead()
self.send_command(cmd=command) if self.model is None:
self.waitForReadyRead() self.send_command('INF2')
self.waitForReadyRead()
if self.pjlink_name is None:
self.send_command('NAME')
self.waitForReadyRead()
if self.power == S_ON and self.source_available is None:
self.send_command('INST')
self.waitForReadyRead()
def _get_status(self, status): def _get_status(self, status):
""" """
@ -256,24 +265,29 @@ class PJLink1(QTcpSocket):
""" """
Processes the initial connection and authentication (if needed). Processes the initial connection and authentication (if needed).
""" """
log.debug('(%s) check_login(data="%s")' % (self.ip, data))
if data is None: if data is None:
# Reconnected setup? # Reconnected setup?
self.waitForReadyRead(5000) # 5 seconds should be more than enough self.waitForReadyRead(5000) # 5 seconds should be more than enough
read = self.readLine(self.maxSize) read = self.readLine(self.maxSize)
dontcare = self.readLine(self.maxSize) # Clean out the trailing \r\n dontcare = self.readLine(self.maxSize) # Clean out the trailing \r\n
if len(read) < 8: if read is None:
log.warn('(%s) read is None - socket error?' % self.ip)
return
elif len(read) < 8:
log.warn('(%s) Not enough data read)' % self.ip) log.warn('(%s) Not enough data read)' % self.ip)
return return
data = decode(read, 'ascii') data = decode(read, 'ascii')
# Possibility of extraneous data on input when reading. # Possibility of extraneous data on input when reading.
# Clean out extraneous characters in buffer. # Clean out extraneous characters in buffer.
dontcare = self.readLine(self.maxSize) dontcare = self.readLine(self.maxSize)
log.debug('(%s) check_login() read "%s"' % (self.ip, data)) log.debug('(%s) check_login() read "%s"' % (self.ip, data.strip()))
# At this point, we should only have the initial login prompt with # At this point, we should only have the initial login prompt with
# possible authentication # possible authentication
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()
# Test for authentication error
if '=' in data: if '=' in data:
data_check = data.strip().split('=') data_check = data.strip().split('=')
else: else:
@ -282,8 +296,25 @@ class PJLink1(QTcpSocket):
# 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': # Oops - projector error
if data_check[1].upper() == 'ERRA':
# Authentication error
self.disconnect_from_host()
self.change_status(E_AUTHENTICATION)
log.debug('(%s) emitting projectorAuthentication() signal' % self.name)
self.projectorAuthentication.emit(self.name)
return
elif data_check[1] == '0' and self.pin is not None:
# Pin set and no authentication needed
self.disconnect_from_host()
self.change_status(E_AUTHENTICATION)
log.debug('(%s) emitting projectorNoAuthentication() signal' % self.name)
self.projectorNoAuthentication.emit(self.name)
return
elif data_check[1] == '1':
# Authenticated login with salt # Authenticated login with salt
log.debug('(%s) Setting hash with salt="%s"' % (self.ip, data_check[2]))
log.debug('(%s) pin="%s"' % (self.ip, self.pin))
salt = qmd5_hash(salt=data_check[2], data=self.pin) salt = qmd5_hash(salt=data_check[2], data=self.pin)
else: else:
salt = None salt = None
@ -294,7 +325,6 @@ class PJLink1(QTcpSocket):
self.waitForReadyRead() self.waitForReadyRead()
if not self.new_wizard and self.state() == self.ConnectedState: if not self.new_wizard and self.state() == self.ConnectedState:
self.timer.start() self.timer.start()
self.poll_loop()
def get_data(self): def get_data(self):
""" """
@ -333,7 +363,7 @@ class PJLink1(QTcpSocket):
return return
if not self.check_command(cmd): if not self.check_command(cmd):
log.warn('(%s) Invalid packet - unknown command "%s"' % self.ip, cmd) log.warn('(%s) Invalid packet - unknown command "%s"' % (self.ip, cmd))
return return
return self.process_command(cmd, data) return self.process_command(cmd, data)
@ -396,6 +426,7 @@ class PJLink1(QTcpSocket):
# Authentication error # Authentication error
self.disconnect_from_host() self.disconnect_from_host()
self.change_status(E_AUTHENTICATION) self.change_status(E_AUTHENTICATION)
log.debug('(%s) emitting projectorAuthentication() signal' % self.ip)
self.projectorAuthentication.emit(self.name) self.projectorAuthentication.emit(self.name)
return return
elif data.upper() == 'ERR1': elif data.upper() == 'ERR1':

32
openlp/core/ui/projector/manager.py
View File

@ -501,7 +501,14 @@ class ProjectorManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ProjectorMa
projector.link.changeStatus.disconnect(self.update_status) projector.link.changeStatus.disconnect(self.update_status)
except TypeError: except TypeError:
pass pass
try:
projector.link.authentication_error.disconnect(self.authentication_error)
except TypeError:
pass
try:
projector.link.no_authentication_error.disconnect(self.no_authentication_error)
except TypeError:
pass
try: try:
projector.timer.stop() projector.timer.stop()
projector.timer.timeout.disconnect(projector.link.poll_loop) projector.timer.timeout.disconnect(projector.link.poll_loop)
@ -566,6 +573,7 @@ class ProjectorManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ProjectorMa
projector.link.disconnect_from_host() projector.link.disconnect_from_host()
record = self.projectordb.get_projector_by_ip(projector.link.ip) record = self.projectordb.get_projector_by_ip(projector.link.ip)
self.projector_form.exec_(record) self.projector_form.exec_(record)
new_record = self.projectordb.get_projector_by_id(record.id)
def on_poweroff_all_projectors(self, opt=None): def on_poweroff_all_projectors(self, opt=None):
""" """
@ -753,7 +761,7 @@ class ProjectorManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ProjectorMa
name=projector.name, name=projector.name,
location=projector.location, location=projector.location,
notes=projector.notes, notes=projector.notes,
pin=projector.pin pin=None if projector.pin == '' else projector.pin
) )
def add_projector(self, opt1, opt2=None): def add_projector(self, opt1, opt2=None):
@ -798,6 +806,8 @@ class ProjectorManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ProjectorMa
thread.finished.connect(thread.deleteLater) thread.finished.connect(thread.deleteLater)
item.link.projectorNetwork.connect(self.update_status) item.link.projectorNetwork.connect(self.update_status)
item.link.changeStatus.connect(self.update_status) item.link.changeStatus.connect(self.update_status)
item.link.projectorAuthentication.connect(self.authentication_error)
item.link.projectorNoAuthentication.connect(self.no_authentication_error)
timer = QtCore.QTimer(self) timer = QtCore.QTimer(self)
timer.setInterval(20000) # 20 second poll interval timer.setInterval(20000) # 20 second poll interval
timer.timeout.connect(item.link.poll_loop) timer.timeout.connect(item.link.poll_loop)
@ -837,7 +847,7 @@ class ProjectorManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ProjectorMa
self.old_projector.link.name = projector.name self.old_projector.link.name = projector.name
self.old_projector.link.ip = projector.ip self.old_projector.link.ip = projector.ip
self.old_projector.link.pin = projector.pin self.old_projector.link.pin = None if projector.pin == '' else projector.pin
self.old_projector.link.port = projector.port self.old_projector.link.port = projector.port
self.old_projector.link.location = projector.location self.old_projector.link.location = projector.location
self.old_projector.link.notes = projector.notes self.old_projector.link.notes = projector.notes
@ -913,6 +923,22 @@ class ProjectorManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ProjectorMa
'blank_selected_projectors', 'show_selected_projectors'], 'blank_selected_projectors', 'show_selected_projectors'],
enabled=True) enabled=True)
@pyqtSlot(str)
def authentication_error(self, name):
QtGui.QMessageBox.warning(self, translate('OpenLP.ProjectorManager',
'"%s" Authentication Error' % name),
'<br />There was an authentictaion error while trying to connect.'
'<br /><br />Please verify your PIN setting '
'for projector item "%s"' % name)
@pyqtSlot(str)
def no_authentication_error(self, name):
QtGui.QMessageBox.warning(self, translate('OpenLP.ProjectorManager',
'"%s" No Authentication Error' % name),
'<br />PIN is set and projector does not require authentication.'
'<br /><br />Please verify your PIN setting '
'for projector item "%s"' % name)
class ProjectorItem(QObject): class ProjectorItem(QObject):
""" """