From 1c548208c1eca10969f35b776b57647d4fa9835a Mon Sep 17 00:00:00 2001 From: Joe Date: Wed, 7 Aug 2013 16:35:08 -0400 Subject: [PATCH 1/4] Edited it so multitarges works --- utils/websockify | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/utils/websockify b/utils/websockify index 1154d925..d7b1735d 100755 --- a/utils/websockify +++ b/utils/websockify @@ -206,12 +206,12 @@ Traffic Legend: # in the form of token: host:port # Extract the token parameter from url - args = parse_qs(urlparse(path)[4]) # 4 is the query from url + token = urlparse(path)[4] # 4 is the query from url + print(token) + #if not 'token' in args or not len(args['token']): + # raise self.EClose("Token not present") - if not args.has_key('token') or not len(args['token']): - raise self.EClose("Token not present") - - token = args['token'][0].rstrip('\n') + #token = args['token'][0].rstrip('\n') # target_cfg can be a single config file or directory of # config files @@ -221,19 +221,14 @@ Traffic Legend: else: cfg_files = [target_cfg] - targets = {} for f in cfg_files: - for line in [l.strip() for l in file(f).readlines()]: + for line in [l.strip() for l in open(f)]: if line and not line.startswith('#'): - ttoken, target = line.split(': ') - targets[ttoken] = target.strip() - - self.vmsg("Target config: %s" % repr(targets)) - - if targets.has_key(token): - return targets[token].split(':') - else: - raise self.EClose("Token '%s' not found" % token) + ftoken, target = line.split(': ') + if ftoken == token: + print(target) + return target.split(':') + raise self.EClose("Token '%s' not found" % token) def do_proxy(self, target): """ From 0788b8d40bcc59f7431b34d53fda2278acbfd42e Mon Sep 17 00:00:00 2001 From: Joe Date: Wed, 7 Aug 2013 16:36:05 -0400 Subject: [PATCH 2/4] Notifications added --- dev | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dev diff --git a/dev b/dev new file mode 100644 index 00000000..e69de29b From 25755fd1455ff6f4293985a164e2b85e043ea94b Mon Sep 17 00:00:00 2001 From: Joe Date: Wed, 7 Aug 2013 16:45:35 -0400 Subject: [PATCH 3/4] cleaned up some debuging stuff of mine --- utils/websockify | 5 ----- 1 file changed, 5 deletions(-) diff --git a/utils/websockify b/utils/websockify index d7b1735d..2a0c4157 100755 --- a/utils/websockify +++ b/utils/websockify @@ -207,11 +207,6 @@ Traffic Legend: # Extract the token parameter from url token = urlparse(path)[4] # 4 is the query from url - print(token) - #if not 'token' in args or not len(args['token']): - # raise self.EClose("Token not present") - - #token = args['token'][0].rstrip('\n') # target_cfg can be a single config file or directory of # config files From 0777151cd2bf37e7a911660e0507e35fe4240b1f Mon Sep 17 00:00:00 2001 From: Joe Date: Fri, 9 Aug 2013 15:49:52 -0400 Subject: [PATCH 4/4] added the check for tokens back in and removed dev print statements --- utils/websockify | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/websockify b/utils/websockify index 2a0c4157..4c68b2dc 100755 --- a/utils/websockify +++ b/utils/websockify @@ -207,6 +207,8 @@ Traffic Legend: # Extract the token parameter from url token = urlparse(path)[4] # 4 is the query from url + if not token: + raise self.EClose("Token not present") # target_cfg can be a single config file or directory of # config files @@ -221,7 +223,6 @@ Traffic Legend: if line and not line.startswith('#'): ftoken, target = line.split(': ') if ftoken == token: - print(target) return target.split(':') raise self.EClose("Token '%s' not found" % token)