From cb3cc46935388d6f5da3ee0b7856ee82ecbb6e70 Mon Sep 17 00:00:00 2001
From: evict <github@evicted.ninja>
Date: Fri, 16 Jun 2017 15:19:01 +0200
Subject: [PATCH] Fixed cookie issue

---
 lib/TunnaClient.py |   7 +++++--
 proxy.py           |   2 +-
 settings.pyc       | Bin 2690 -> 0 bytes
 3 files changed, 6 insertions(+), 3 deletions(-)
 delete mode 100644 settings.pyc

diff --git a/lib/TunnaClient.py b/lib/TunnaClient.py
index 539531e..47e0830 100644
--- a/lib/TunnaClient.py
+++ b/lib/TunnaClient.py
@@ -250,11 +250,14 @@ def HTTPreq(self,url,data=None,headers=None):
 			kargs['url']=url
 			if data:  kargs['data']=data	#Will do a GET if no data else POST
 			if headers:  kargs['headers']=headers
-			else: kargs['headers']={'Content-Type':'application/octet-stream','Cookie':self.cookie}
+			else: kargs['headers']={'Content-Type':'application/octet-stream'}
+
+                        if self.options['cookie']:
+                            kargs['headers'].update({'Cookie':self.cookie})
 
 			if self.options['bauth']:
                             kargs['headers'].update({'Authorization': "Basic %s" % self.bauth})
-				
+
 			#Make Request
 			f=opener.open(urllib2.Request(**kargs))
 
diff --git a/proxy.py b/proxy.py
index 9085923..89f1a85 100644
--- a/proxy.py
+++ b/proxy.py
@@ -62,7 +62,7 @@ def main():
 	advancedGroup.add_option('-q','--ping-interval', help='webshprx pinging thread interval (default = 0.5)', dest='ping_delay', action='store', type='float', default=Defaults['ping_delay'])
 	advancedGroup.add_option('-s','--start-ping', help='Start the pinging thread first - some services send data first (eg. SSH)', dest='start_p_thread', action='store_true', default=Defaults['start_p_thread'])
 	advancedGroup.add_option('-c','--verify-server-cert', help='Verify Server Certificate', dest='start_p_thread', action='store_false', default=Defaults['ignoreServerCert'])
-	advancedGroup.add_option('-C','--cookie', help='Request cookies', dest='cookie', action='store', default=Defaults['Cookie'])
+	advancedGroup.add_option('-C','--cookie', help='Request cookies', dest='cookie', action='store')
 	advancedGroup.add_option('-t','--authentication', help='Basic authentication', dest='bauth', action='store_true')
 
 	parser.add_option_group(advancedGroup)
diff --git a/settings.pyc b/settings.pyc
deleted file mode 100644
index 7cb8c5f5d0f6b2d83a83682f7d46c23b5e534786..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2690
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
JFOh`M{{}Ep3Zno3