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

Basic Authentication now working

Browse Source
This commit is contained in:
Tim Bentley 2013-03-08 19:15:49 +00:00
parent 6bf07f9dce
commit c62dab074e
3 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/ui/slidecontroller.py
View File

@ -860,7 +860,7 @@ class SlideController(DisplayController):
"""
Go to the requested slide
"""
if not self.serviceItem or not message[0]:
if not self.service_item or not message[0]:
return
index = int(message[0])
if not self.service_item:

18
openlp/plugins/remotes/lib/httpauth.py
View File

@ -45,6 +45,7 @@ def check_credentials(user_name, password):
Returns None on success or a string describing the error on failure
"""
# @todo make from config
print "check_credentials"
if user_name == 'openlp' and password == 'openlp':
return None
else:
@ -59,18 +60,17 @@ def check_auth(*args, **kwargs):
is not None, a login is required and the entry is evaluated as a list of
conditions that the user must fulfill
"""
print "check"
print "check_auth"
conditions = cherrypy.request.config.get('auth.require', None)
print urlparse.urlparse(cherrypy.url()), conditions
print conditions
print args, kwargs
print urlparse.urlparse(cherrypy.url())
url = urlparse.urlparse(cherrypy.url())
print urlparse.parse_qs(url.query)
if conditions is not None:
username = cherrypy.session.get(SESSION_KEY)
print username
if username:
cherrypy.request.login = username
for condition in conditions:
print "c ", condition
# A condition is just a callable that returns true or false
if not condition():
raise cherrypy.HTTPRedirect("/auth/login")
@ -84,14 +84,15 @@ def require_auth(*conditions):
"""
A decorator that appends conditions to the auth.require config variable.
"""
print conditions
def decorate(f):
"""
Lets process a decoration.
"""
if not hasattr(f, '_cp_config'):
f._cp_config = dict()
if 'auth.require' not in f._cp_config:
f._cp_config['auth.require'] = []
f._cp_config['auth.require'].extend(conditions)
print "a ", [f]
return f
return decorate
@ -182,6 +183,9 @@ class AuthController(object):
@cherrypy.expose
def logout(self, from_page="/"):
"""
Provides the actual logout functions
"""
sess = cherrypy.session
username = sess.get(SESSION_KEY, None)
sess[SESSION_KEY] = None

27
openlp/plugins/remotes/lib/httpserver.py
View File

@ -205,8 +205,6 @@ class HttpConnection(object):
"""
Initialise the http connection. Listen out for socket signals.
"""
#log.debug(u'Initialise HttpConnection: %s' % socket.peerAddress())
#self.socket = socket
self.parent = parent
self.routes = [
(u'^/$', self.serve_file),
@ -215,8 +213,9 @@ class HttpConnection(object):
(r'^/api/poll$', self.poll),
(r'^/stage/api/poll$', self.poll),
(r'^/api/controller/(live|preview)/(.*)$', self.controller),
(r'^/stage/api/controller/live/(.*)$', self.controller),
(r'^/stage/api/controller/(live|preview)/(.*)$', self.controller),
(r'^/api/service/(.*)$', self.service),
(r'^/stage/api/service/(.*)$', self.service),
(r'^/api/display/(hide|show|blank|theme|desktop)$', self.display),
(r'^/api/alert$', self.alert),
(r'^/api/plugin/(search)$', self.pluginInfo),
@ -227,11 +226,15 @@ class HttpConnection(object):
self.translate()
@cherrypy.expose
#@require_auth(auth)
@require_auth()
def default(self, *args, **kwargs):
"""
Handles the requests for the main url. This is secure depending on settings.
Handles the requests for the main url. This is secure depending on settings in config.
"""
print "default"
url = urlparse.urlparse(cherrypy.url())
self.url_params = urlparse.parse_qs(url.query)
print url
# Loop through the routes we set up earlier and execute them
return self._process_http_request(args, kwargs)
@ -244,22 +247,17 @@ class HttpConnection(object):
url = urlparse.urlparse(cherrypy.url())
self.url_params = urlparse.parse_qs(url.query)
print url
print [self.url_params]
#return self.serve_file(u'stage')
return self._process_http_request(args, kwargs)
@cherrypy.expose
def files(self, *args, **kwargs):
"""
Handles the requests for the stage url. This is not secure.
Handles the requests for the files url. This is not secure.
"""
print "files"
url = urlparse.urlparse(cherrypy.url())
self.url_params = urlparse.parse_qs(url.query)
print url
print [self.url_params]
print args
#return self.serve_file(args)
return self._process_http_request(args, kwargs)
def _process_http_request(self, args, kwargs):
@ -269,13 +267,11 @@ class HttpConnection(object):
print "common handler"
url = urlparse.urlparse(cherrypy.url())
self.url_params = urlparse.parse_qs(url.query)
print url
print [self.url_params]
response = None
for route, func in self.routes:
match = re.match(route, url.path)
if match:
print 'Route "%s" matched "%s"', route, url.path
print 'Route "%s" matched "%s"', route, url.path, func
log.debug('Route "%s" matched "%s"', route, url.path)
args = []
for param in match.groups():
@ -346,7 +342,6 @@ class HttpConnection(object):
Ultimately for i18n, this could first look for xx/file.html before
falling back to file.html... where xx is the language, e.g. 'en'
"""
print "serve_file", filename
log.debug(u'serve file request %s' % filename)
if not filename:
filename = u'index.html'
@ -483,6 +478,7 @@ class HttpConnection(object):
Registry().execute(event, [0])
json_data = {u'results': {u'success': True}}
cherrypy.response.headers['Content-Type'] = u'application/json'
print json.dumps(json_data)
return json.dumps(json_data)
def service(self, action):
@ -549,6 +545,7 @@ class HttpConnection(object):
"""
Go live on an item of type ``plugin``.
"""
print "go_live"
try:
id = json.loads(self.url_params[u'data'][0])[u'request'][u'id']
except KeyError, ValueError: