[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20774 - in gnunet/src/gns: . proxy
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r20774 - in gnunet/src/gns: . proxy |
|
Date: |
Mon, 26 Mar 2012 17:13:01 +0200 |
Author: schanzen
Date: 2012-03-26 17:13:01 +0200 (Mon, 26 Mar 2012)
New Revision: 20774
Added:
gnunet/src/gns/proxy/gnunet-gns-proxy.py
Removed:
gnunet/src/gns/proxy/proxy.py
Modified:
gnunet/src/gns/gnunet-service-gns_resolver.c
Log:
-fixes, no deflate/partial content in proxy
Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c 2012-03-26 15:12:34 UTC
(rev 20773)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c 2012-03-26 15:13:01 UTC
(rev 20774)
@@ -2164,7 +2164,7 @@
free_resolver_handle(rh);
}
else if (GNUNET_CRYPTO_short_hash_cmp(&rh->authority_chain_head->zone,
- &local_zone))
+ &local_zone) == 0)
{
/* our zone, just append .gnunet */
answer_len = strlen(rh->name) + strlen(GNUNET_GNS_TLD) + 2;
@@ -2190,11 +2190,17 @@
// strlen(next_authority->name) + 2);
memset(next_authority_name, 0, strlen(rh->name)+
strlen(next_authority->name) + 2);
- strcpy(next_authority_name, rh->name);
- strcpy(next_authority_name+strlen(rh->name)+1, ".");
- strcpy(next_authority_name+strlen(rh->name)+2, next_authority->name);
-
+ GNUNET_snprintf(next_authority_name, MAX_DNS_NAME_LENGTH,
+ "%s.%s", rh->name, next_authority->name);
+ //strcpy(next_authority_name, rh->name);
+ //strcpy(next_authority_name+strlen(rh->name)+1, ".");
+ //strcpy(next_authority_name+strlen(rh->name)+2, next_authority->name);
+
strcpy(rh->name, next_authority_name);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "No PSEU found for authority %s. Promoting back: %s\n",
+ next_authority->name, rh->name);
+
GNUNET_CONTAINER_DLL_remove(rh->authority_chain_head,
rh->authority_chain_tail,
next_authority);
Copied: gnunet/src/gns/proxy/gnunet-gns-proxy.py (from rev 20765,
gnunet/src/gns/proxy/proxy.py)
===================================================================
--- gnunet/src/gns/proxy/gnunet-gns-proxy.py (rev 0)
+++ gnunet/src/gns/proxy/gnunet-gns-proxy.py 2012-03-26 15:13:01 UTC (rev
20774)
@@ -0,0 +1,197 @@
+#!/usr/bin/python
+
+"""
+Copyright (c) 2001 SUZUKI Hisao
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+"""
+
+__doc__ = """Tiny HTTP Proxy.
+
+This module implements GET, HEAD, POST, PUT and DELETE methods
+on BaseHTTPServer, and behaves as an HTTP proxy. The CONNECT
+method is also implemented experimentally, but has not been
+tested yet.
+
+Any help will be greatly appreciated. SUZUKI Hisao
+"""
+
+__version__ = "0.2.1"
+
+import BaseHTTPServer, select, socket, SocketServer, urlparse, re, string, os
+
+class ProxyHandler (BaseHTTPServer.BaseHTTPRequestHandler):
+ __base = BaseHTTPServer.BaseHTTPRequestHandler
+ __base_handle = __base.handle
+
+ server_version = "TinyHTTPProxy/" + __version__
+ rbufsize = 0 # self.rfile Be unbuffered
+ host_port = ()
+
+ def handle(self):
+ (ip, port) = self.client_address
+ if hasattr(self, 'allowed_clients') and ip not in self.allowed_clients:
+ self.raw_requestline = self.rfile.readline()
+ if self.parse_request(): self.send_error(403)
+ else:
+ self.__base_handle()
+
+ def _connect_to(self, netloc, soc):
+ i = netloc.find(':')
+ to_replace = ""
+ if i >= 0:
+ print 'calling gnunet-gns -a '+netloc[:i]
+ auth = os.popen("gnunet-gns -a "+netloc[:i])
+ lines = auth.readlines()
+ print 'result: '+lines[0].split(" ")[-1].rstrip()
+ to_replace = lines[0].split(" ")[-1].rstrip()
+ self.host_port = netloc[:i], int(netloc[i+1:])
+ else:
+ print 'calling gnunet-gns -a '+netloc
+ auth = os.popen("gnunet-gns -a "+netloc)
+ lines = auth.readlines()
+ print 'result: '+lines[0].split(" ")[-1].rstrip()
+ to_replace = lines[0].split(" ")[-1].rstrip()
+ self.host_port = netloc, 80
+ print "\t" "connect to %s:%d" % self.host_port
+ try: soc.connect(self.host_port)
+ except socket.error, arg:
+ try: msg = arg[1]
+ except: msg = arg
+ self.send_error(404, msg)
+ return (0, 0)
+ return (1, to_replace)
+
+ def do_CONNECT(self):
+ soc = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ try:
+ res, to_repl = self._connect_to(self.path, soc)
+ if res:
+ self.log_request(200)
+ self.wfile.write(self.protocol_version +
+ " 200 Connection established\r\n")
+ self.wfile.write("Proxy-agent: %s\r\n" % self.version_string())
+ self.wfile.write("\r\n")
+ self._read_write(soc, to_repl, 300)
+ finally:
+ print "\t" "bye"
+ soc.close()
+ self.connection.close()
+
+ def shorten_zkey(self):
+ return lambda mo: 'a href="http://'+os.popen("gnunet-gns
-s"+string.replace(mo.group(1), 'a href="http://', "")).readlines()[0].split("
")[-1].rstrip()
+
+ def replace_and_shorten(self, to_repl):
+ return lambda mo: 'a href="http://'+os.popen("gnunet-gns -s
"+string.replace(mo.group(1)+to_repl, 'a href="http://',
"")).readlines()[0].split(" ")[-1].rstrip()
+ #full = string.replace(mo.group(1)+to_repl, 'a href="http://', "")
+ #print 'calling gnunet-gns -s '+full
+ #s = os.popen("gnunet-gns -s "+full)
+ #lines = s.readlines()
+ #print 'short: '+lines[0].split(" ")[-1].rstrip()
+ #return 'a href="'+lines[0].split(" ")[-1].rstrip()
+
+ def do_GET(self):
+ (scm, netloc, path, params, query, fragment) = urlparse.urlparse(
+ self.path, 'http')
+ if scm != 'http' or fragment or not netloc:
+ self.send_error(400, "bad url %s" % self.path)
+ return
+ soc = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ try:
+ res, to_repl = self._connect_to(netloc, soc)
+ if res:
+ self.log_request()
+ soc.send("%s %s %s\r\n" % (
+ self.command,
+ urlparse.urlunparse(('', '', path, params, query, '')),
+ self.request_version))
+ if (re.match("(\w+\.)*gnunet", self.headers['Host'])):
+ leho = os.popen("gnunet-gns -t LEHO -u
"+self.headers['Host']).readlines()
+ if (len(leho) < 2):
+ print "Legacy hostname lookup failed!"
+ elif (len(leho) == 1):
+ print "Legacy hostname not present!"
+ else:
+ newhost = leho[1].split(" ")[-1].rstrip()
+ print "Changing Host: "+self.headers['Host']+" to "+newhost
+ self.headers['Host'] = newhost
+ self.headers['Connection'] = 'close'
+ del self.headers['Proxy-Connection']
+ del self.headers['Accept-Encoding']
+ for key_val in self.headers.items():
+ soc.send("%s: %s\r\n" % key_val)
+ soc.send("\r\n")
+ self._read_write(soc, to_repl)
+ finally:
+ print "\t" "bye"
+ soc.close()
+ self.connection.close()
+
+ def _read_write(self, soc, to_repl="", max_idling=20):
+ iw = [self.connection, soc]
+ ow = []
+ count = 0
+ msg = ''
+ while 1:
+ count += 1
+ (ins, _, exs) = select.select(iw, ow, iw, 3)
+ if exs:
+ break
+ if ins:
+ for i in ins:
+ if i is soc:
+ out = self.connection
+ else:
+ out = soc
+ data = i.recv(8192)
+ if data:
+ try:
+ print self.headers
+ data = re.sub(r'\nAccept-Ranges: \w+', r'', data)
+ data = re.sub('(a href="http://(\w+\.)*zkey)',
+ self.shorten_zkey(), data)
+ if (re.match("(\w+\.)*gnunet", self.host_port[0])):
+ arr = self.host_port[0].split('.')
+ arr.pop(0)
+ data = re.sub('(a href="http://(\w+\.)*)(\+)',
+ self.replace_and_shorten(to_repl), data)
+ print data
+ out.send(data)
+ count = 0
+ except:
+ print "GNS exception:", sys.exc_info()[0]
+
+ else:
+ print "\t" "idle", count
+ print msg
+ if count == max_idling: break
+
+ do_HEAD = do_GET
+ do_POST = do_GET
+ do_PUT = do_GET
+ do_DELETE=do_GET
+
+class ThreadingHTTPServer (SocketServer.ThreadingMixIn,
+ BaseHTTPServer.HTTPServer): pass
+
+if __name__ == '__main__':
+ from sys import argv
+ if argv[1:] and argv[1] in ('-h', '--help'):
+ print argv[0], "[port [allowed_client_name ...]]"
+ else:
+ if argv[2:]:
+ allowed = []
+ for name in argv[2:]:
+ client = socket.gethostbyname(name)
+ allowed.append(client)
+ print "Accept: %s (%s)" % (client, name)
+ ProxyHandler.allowed_clients = allowed
+ del argv[2:]
+ else:
+ print "Any clients will be served..."
+ BaseHTTPServer.test(ProxyHandler, ThreadingHTTPServer)
+
Deleted: gnunet/src/gns/proxy/proxy.py
===================================================================
--- gnunet/src/gns/proxy/proxy.py 2012-03-26 15:12:34 UTC (rev 20773)
+++ gnunet/src/gns/proxy/proxy.py 2012-03-26 15:13:01 UTC (rev 20774)
@@ -1,194 +0,0 @@
-#!/usr/bin/python
-
-"""
-Copyright (c) 2001 SUZUKI Hisao
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-"""
-
-__doc__ = """Tiny HTTP Proxy.
-
-This module implements GET, HEAD, POST, PUT and DELETE methods
-on BaseHTTPServer, and behaves as an HTTP proxy. The CONNECT
-method is also implemented experimentally, but has not been
-tested yet.
-
-Any help will be greatly appreciated. SUZUKI Hisao
-"""
-
-__version__ = "0.2.1"
-
-import BaseHTTPServer, select, socket, SocketServer, urlparse, re, string, os
-
-class ProxyHandler (BaseHTTPServer.BaseHTTPRequestHandler):
- __base = BaseHTTPServer.BaseHTTPRequestHandler
- __base_handle = __base.handle
-
- server_version = "TinyHTTPProxy/" + __version__
- rbufsize = 0 # self.rfile Be unbuffered
- host_port = ()
-
- def handle(self):
- (ip, port) = self.client_address
- if hasattr(self, 'allowed_clients') and ip not in self.allowed_clients:
- self.raw_requestline = self.rfile.readline()
- if self.parse_request(): self.send_error(403)
- else:
- self.__base_handle()
-
- def _connect_to(self, netloc, soc):
- i = netloc.find(':')
- to_replace = ""
- if i >= 0:
- print 'calling gnunet-gns -a '+netloc[:i]
- auth = os.popen("gnunet-gns -a "+netloc[:i])
- lines = auth.readlines()
- print 'result: '+lines[0].split(" ")[-1].rstrip()
- to_replace = lines[0].split(" ")[-1].rstrip()
- self.host_port = netloc[:i], int(netloc[i+1:])
- else:
- print 'calling gnunet-gns -a '+netloc
- auth = os.popen("gnunet-gns -a "+netloc)
- lines = auth.readlines()
- print 'result: '+lines[0].split(" ")[-1].rstrip()
- to_replace = lines[0].split(" ")[-1].rstrip()
- self.host_port = netloc, 80
- print "\t" "connect to %s:%d" % self.host_port
- try: soc.connect(self.host_port)
- except socket.error, arg:
- try: msg = arg[1]
- except: msg = arg
- self.send_error(404, msg)
- return (0, 0)
- return (1, to_replace)
-
- def do_CONNECT(self):
- soc = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- try:
- res, to_repl = self._connect_to(self.path, soc)
- if res:
- self.log_request(200)
- self.wfile.write(self.protocol_version +
- " 200 Connection established\r\n")
- self.wfile.write("Proxy-agent: %s\r\n" % self.version_string())
- self.wfile.write("\r\n")
- self._read_write(soc, to_repl, 300)
- finally:
- print "\t" "bye"
- soc.close()
- self.connection.close()
-
- def shorten_zkey(self):
- return lambda mo: 'a href="http://'+os.popen("gnunet-gns
-s"+string.replace(mo.group(1), 'a href="http://', "")).readlines()[0].split("
")[-1].rstrip()
-
- def replace_and_shorten(self, to_repl):
- return lambda mo: 'a href="http://'+os.popen("gnunet-gns -s
"+string.replace(mo.group(1)+to_repl, 'a href="http://',
"")).readlines()[0].split(" ")[-1].rstrip()
- #full = string.replace(mo.group(1)+to_repl, 'a href="http://', "")
- #print 'calling gnunet-gns -s '+full
- #s = os.popen("gnunet-gns -s "+full)
- #lines = s.readlines()
- #print 'short: '+lines[0].split(" ")[-1].rstrip()
- #return 'a href="'+lines[0].split(" ")[-1].rstrip()
-
- def do_GET(self):
- (scm, netloc, path, params, query, fragment) = urlparse.urlparse(
- self.path, 'http')
- if scm != 'http' or fragment or not netloc:
- self.send_error(400, "bad url %s" % self.path)
- return
- soc = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- try:
- res, to_repl = self._connect_to(netloc, soc)
- if res:
- self.log_request()
- soc.send("%s %s %s\r\n" % (
- self.command,
- urlparse.urlunparse(('', '', path, params, query, '')),
- self.request_version))
- if (re.match("(\w+\.)*gnunet", self.headers['Host'])):
- leho = os.popen("gnunet-gns -t LEHO -u
"+self.headers['Host']).readlines()
- if (len(leho) < 2):
- print "Legacy hostname lookup failed!"
- elif (len(leho) == 1):
- print "Legacy hostname not present!"
- else:
- newhost = leho[1].split(" ")[-1].rstrip()
- print "Changing Host: "+self.headers['Host']+" to "+newhost
- self.headers['Host'] = newhost
- self.headers['Connection'] = 'close'
- del self.headers['Proxy-Connection']
- for key_val in self.headers.items():
- soc.send("%s: %s\r\n" % key_val)
- soc.send("\r\n")
- self._read_write(soc, to_repl)
- finally:
- print "\t" "bye"
- soc.close()
- self.connection.close()
-
- def _read_write(self, soc, to_repl="", max_idling=20):
- iw = [self.connection, soc]
- ow = []
- count = 0
- msg = ''
- while 1:
- count += 1
- (ins, _, exs) = select.select(iw, ow, iw, 3)
- if exs:
- break
- if ins:
- for i in ins:
- if i is soc:
- out = self.connection
- else:
- out = soc
- data = i.recv(8192)
- if data:
- try:
- data = re.sub('(a href="http://(\w+\.)*zkey)',
- self.shorten_zkey(), data)
- if (re.match("(\w+\.)*gnunet", self.host_port[0])):
- arr = self.host_port[0].split('.')
- arr.pop(0)
- data = re.sub('(a href="http://(\w+\.)*)(\+)',
- self.replace_and_shorten(to_repl), data)
- #print data
- out.send(data)
- count = 0
- except:
- print "GNS exception:", sys.exc_info()[0]
-
- else:
- print "\t" "idle", count
- print msg
- if count == max_idling: break
-
- do_HEAD = do_GET
- do_POST = do_GET
- do_PUT = do_GET
- do_DELETE=do_GET
-
-class ThreadingHTTPServer (SocketServer.ThreadingMixIn,
- BaseHTTPServer.HTTPServer): pass
-
-if __name__ == '__main__':
- from sys import argv
- if argv[1:] and argv[1] in ('-h', '--help'):
- print argv[0], "[port [allowed_client_name ...]]"
- else:
- if argv[2:]:
- allowed = []
- for name in argv[2:]:
- client = socket.gethostbyname(name)
- allowed.append(client)
- print "Accept: %s (%s)" % (client, name)
- ProxyHandler.allowed_clients = allowed
- del argv[2:]
- else:
- print "Any clients will be served..."
- BaseHTTPServer.test(ProxyHandler, ThreadingHTTPServer)
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20774 - in gnunet/src/gns: . proxy,
gnunet <=