Browse Source

server: allow node ids to contain upper case letters, too

Helge Jung 9 years ago
parent
commit
5a62481c3a
1 changed files with 4 additions and 3 deletions
  1. 4 3
      ffstatus/server.py

+ 4 - 3
ffstatus/server.py

@@ -66,13 +66,14 @@ class BatcaveHttpRequestHandler(BaseHTTPRequestHandler):
 
 		# /node/<id>.json - node's data
 		# /node/<id>/field - return specific field from node's data
-		m = re.match(r'node/([a-f0-9]{12})(?P<cmd>\.json|/[a-zA-Z0-9_\-\.]+)$', path)
+		m = re.match(r'node/(?P<id>[a-fA-F0-9]{12})(?P<cmd>\.json|/[a-zA-Z0-9_\-\.]+)$', path)
 		if m != None:
 			cmd = m.group('cmd')
+			nodeid = m.group('id').lower()
 			if cmd == '.json':
-				self.respond_node(m.group(1))
+				self.respond_node(nodeid)
 			else:
-				self.respond_nodedetail(m.group(1), cmd[1:])
+				self.respond_nodedetail(nodeid, cmd[1:])
 			return
 
 		# /status/<id> - node's status