fixed: #231

Jrohy · Oct 3, 2019 · d6d35bc · d6d35bc
1 parent b6527bf
commit d6d35bc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 13 deletions.
diff --git a/v2ray_util/__init__.py b/v2ray_util/__init__.py
@@ -1,3 +1,3 @@
-__version__ = '3.6.5'
+__version__ = '3.6.6b1'
 
 from .util_core.trans import _
diff --git a/v2ray_util/config_modify/cdn.py b/v2ray_util/config_modify/cdn.py
@@ -9,19 +9,15 @@
 from ..util_core.utils import StreamType, ColorStr, get_ip
 
 class CDNModifier:
-    def __init__(self, group_tag='A', group_index=-1, domain='', fake_domain=''):
+    def __init__(self, group_tag='A', group_index=-1, domain=''):
         self.domain = domain
         self.group_tag = group_tag
         self.group_index = group_index
         if domain:
-            self.__writeWS(fake_domain)
+            StreamWriter(self.group_tag, self.group_index, StreamType.WS).write()
 
         self.gw = GroupWriter(group_tag, group_index)
 
-    def __writeWS(self, fake_domain):
-        sw = StreamWriter(self.group_tag, self.group_index, StreamType.WS)
-        sw.write(**{'host': fake_domain})
-
     def openHttp(self):
         '''
         cloudflare cdn proxy 80 port
@@ -65,7 +61,6 @@ def modify():
             CDNModifier(group.tag, group.index).closeHttp()
             return True
 
-        fake_domain = input(_("please input ws fake domain(enter to no need): "))
         domain = input(_("please input run cdn mode domain: "))
         if not domain:
             print(ColorStr.yellow(_("domain is empty!")))
@@ -87,7 +82,7 @@ def modify():
                 print("")
                 return
 
-        cm = CDNModifier(group.tag, group.index, domain, fake_domain)
+        cm = CDNModifier(group.tag, group.index, domain)
 
         if choice == '1':
             cm.openHttp()

diff --git a/v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.mo b/v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.mo
diff --git a/v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.po b/v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.po
@@ -591,9 +591,6 @@ msgstr "2.443端口 + ws"
 msgid "3.close cdn(80 port)"
 msgstr "3.关闭cdn(80端口)"
 
-msgid "please input ws fake domain(enter to no need): "
-msgstr "请输入ws要伪装的域名(不伪装直接回车): "
-
 msgid "please input run cdn mode domain: "
 msgstr "请输入走cdn的域名: "
 

diff --git a/v2ray_util/util_core/writer.py b/v2ray_util/util_core/writer.py
@@ -199,7 +199,8 @@ def write(self, **kw):
             ws = self.load_template('ws.json')
             salt = '/' + ''.join(random.sample(string.ascii_letters + string.digits, 8)) + '/'
             ws["wsSettings"]["path"] = salt
-            ws["wsSettings"]["headers"]["Host"] = kw['host']
+            if "host" in kw:
+                ws["wsSettings"]["headers"]["Host"] = kw['host']
             self.part_json["streamSettings"] = ws
 
         elif self.stream_type == StreamType.H2: