diff --git a/direct/src/http/webNotifyDebug.py b/direct/src/http/webNotifyDebug.py index c5c9bc2b6c..e4826c6f66 100755 --- a/direct/src/http/webNotifyDebug.py +++ b/direct/src/http/webNotifyDebug.py @@ -1,18 +1,63 @@ from direct.task import Task from direct.http import WebRequest from direct.directnotify import DirectNotifyGlobal +import random, string class webNotifyDebug: - def __init__(self, portNumber = 8888): + def __init__(self, portNumber = 8888, username = None, password = None): self.portNumber = portNumber + self.username = username + self.password = password + self.passwordProtect = False + self.pageToHit = 'debug' + self.authTokens = [] self.web = WebRequest.WebRequestDispatcher() self.web.listenOnPort(int(self.portNumber)) # 'debug' will be the name of the page we have to hit - self.web.registerGETHandler('debug', self.debug) + # If both a username and password should be specified, then + # we will need to present a username and password prompt to the user + if self.username and self.password: + # set self.passwordProtect to True + self.passwordProtect = True + # Register 'debug' with the password prompt + self.web.registerGETHandler('debug', self.passwordPrompt) + self.web.registerGETHandler('authDebug', self.authDebug) + self.pageToHit = 'authDebug' + else: + self.web.registerGETHandler('debug', self.debug) self.startCheckingIncomingHTTP() - def listAllCategories(self, replyTo, optionalMessage = None): + def passwordPrompt(self, replyTo, **kw): + # This should get called if we need to prompt the user for + # a username and password. + try: + username = kw['username'] + password = kw['password'] + except KeyError: + # the user is probably making their initial connection to the + # password protected site. Present them with the login page + replyTo.respond('\nDirect Notify Web Interface - Username and Password Required\n\nUsername/Password authentication has been enabled. You must provide the following before gaining access to the system:

\nUsername:
\nPassword:
\n
\n') + return + + # If the username and password are correct, we need to generate an + # auth token and place it in self.authTokens. If the username and + # password are incorrect. Return an error message indicating such. + + if username == self.username and password == self.password: + # Username and Password match + # Generate auth token + authToken = self.genToken() + # Place the authToken in the list of valid auth tokens + self.authTokens.append(authToken) + + replyTo.respond('Username and Password GoodUsername and Password are good, please remember to logout when done. Click here to continue' % (authToken)) + return + else: + replyTo.respond('Username and/or password are incorrect') + return + + def listAllCategories(self, replyTo, optionalMessage = None, authToken = None): # Return a web page with a list of all registered notify categories # along with an HTML widget to chage their debug state @@ -27,7 +72,10 @@ class webNotifyDebug: # define the static foot - foot = '
Main Menu' + if authToken: + foot = '
Main Menu' % (self.pageToHit, authToken) + else: + foot = '
Main Menu' % self.pageToHit # Sort our catagory list into alpha order @@ -41,39 +89,45 @@ class webNotifyDebug: tempCategory = DirectNotifyGlobal.directNotify.getCategory(item) debugStatus = tempCategory.getDebug() if debugStatus == 0: - body = '%s%sOff' % (body, select, item) + if authToken: + body = '%s%sOff' % (body, select, self.pageToHit, item, authToken) + else: + body = '%s%sOff' % (body, select, self.pageToHit, item) else: - body = '%s%sOn' % (body, select, item) + if authToken: + body = '%s%sOn' % (body, select, self.pageToHit, item, authToken) + else: + body = '%s%sOn' % (body, select, self.pageToHit, item) replyTo.respond('%s\n%s\n%s\n' % (head, body, foot)) - def turnCatOn(self, item, replyTo, sString = None): + def turnCatOn(self, item, replyTo, sString = None, authToken = None): # Used to turn a catagory (item), to the on state try: notifyItem = DirectNotifyGlobal.directNotify.getCategory(item) notifyItem.setDebug(1) updateMessage = 'Category %s, has been turned on' % (item) if not sString: - self.listAllCategories(replyTo, updateMessage) + self.listAllCategories(replyTo, updateMessage, authToken) else: - self.searchForCat(sString, replyTo, updateMessage) + self.searchForCat(sString, replyTo, updateMessage, authToken) except AttributeError: replyTo.respond('Invalid Category Passed') - def turnCatOff(self, item, replyTo, sString = None): + def turnCatOff(self, item, replyTo, sString = None, authToken = None): # Used to turn a catagory (item), to the off state try: notifyItem = DirectNotifyGlobal.directNotify.getCategory(item) notifyItem.setDebug(0) updateMessage = 'Category %s, has been turned off' % (item) if not sString: - self.listAllCategories(replyTo, updateMessage) + self.listAllCategories(replyTo, updateMessage, authToken) else: - self.searchForCat(sString, replyTo, updateMessage) + self.searchForCat(sString, replyTo, updateMessage, authToken) except AttributeError: replyTo.respond('Invalid Category Passed') - def searchForCat(self, searchString, replyTo, toggle = None): + def searchForCat(self, searchString, replyTo, toggle = None, authToken = None): # Used to execute a substring search for a category completeList = DirectNotifyGlobal.directNotify.getCategories() resultList = [] @@ -88,53 +142,110 @@ class webNotifyDebug: head = '\n\n\nDirectNotify - Search Results\n\n\n

DirectNotify - Listing All Categories

\n
\n\n\n' else: head = '\n\n\nDirectNotify - Search Results\n\n\n

DirectNotify - Listing All Categories

\n
%s

CategoryDebug Status
\n\n\n' % (toggle) - foot = '
CategoryDebug Status

Main Menu' + if authToken: + foot = '
Main Menu' % (authToken) + else: + foot = '
Main Menu' body = '' for item in resultList: select = '%s' % (item) tempCategory = DirectNotifyGlobal.directNotify.getCategory(item) debugStatus = tempCategory.getDebug() if debugStatus == 0: - body = '%s%sOff' % (body, select, item, searchString) + if authToken: + body = '%s%sOff' % (body, select, self.pageToHit, item, searchString, authToken) + else: + body = '%s%sOff' % (body, select, self.pageToHit, item, searchString) else: - body = '%s%sOn' % (body, select, item, searchString) + if authToken: + body = '%s%sOn' % (body, select, self.pageToHit, item, searchString, authToken) + else: + body = '%s%sOn' % (body, select, self.pageToHit, item, searchString) replyTo.respond('%s\n%s\n%s\n' % (head, body, foot)) - - - def debug(self, replyTo, **kw): + try: + authToken = kw['authToken'] + except KeyError: + authToken = None try: command = kw['command'] if command == 'listAll': - self.listAllCategories(replyTo) + if self.passwordProtect: + self.listAllCategories(replyTo, None, authToken) + else: + self.listAllCategories(replyTo) elif command == 'on': item = kw['item'] try: sString = kw['sString'] - self.turnCatOn(item, replyTo, sString) + if self.passwordProtect: + self.turnCatOn(item, replyTo, sString, authToken) + else: + self.turnCatOn(item, replyTo, sString) except KeyError: - self.turnCatOn(item, replyTo) + if self.passwordProtect: + self.turnCatOn(item, replyTo, None, authToken) + else: + self.turnCatOn(item, replyTo) elif command == 'off': item = kw['item'] try: sString = kw['sString'] - self.turnCatOff(item, replyTo, sString) + if self.passwordProtect: + self.turnCatOff(item, replyTo, sString, authToken) + else: + self.turnCatOff(item, replyTo, sString) except KeyError: - self.turnCatOff(item, replyTo) + if self.passwordProtect: + self.turnCatOff(item, replyTo, None, authToken) + else: + self.turnCatOff(item, replyTo) elif command == 'search': searchString = kw['searchString'] - self.searchForCat(searchString, replyTo) + if self.passwordProtect: + self.searchForCat(searchString, replyTo, None, authToken) + else: + self.searchForCat(searchString, replyTo) + elif command == 'logOff' and authToken: + self.logOut(replyTo, authToken) else: replyTo.respond('Error: Invalid args') return except KeyError: pass # Basic Index Page - - replyTo.respond('\n\nDirectNotify Web Interface\n\n\n
\n

DirectNotify Web Interface

\n
\n
\n
Search for a DirectNotify Category:
\n
\n
\nDisplay all DirectNotify Categories\n\n') + if not authToken: + replyTo.respond('\n\nDirectNotify Web Interface\n\n\n
\n

DirectNotify Web Interface

\n
\n
\n
Search for a DirectNotify Category:
\n
\n
\nDisplay all DirectNotify Categories\n\n' % (self.pageToHit)) + else: + replyTo.respond('\n\nDirectNotify Web Interface\n\n\n
\n

DirectNotify Web Interface

\n
\n
\n
Search for a DirectNotify Category:
\n
\n
\nDisplay all DirectNotify Categories
\n