fix: Use expected TLS config and update to the latest cloudflare API version

Author: Dragon-Born

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='WARP+ to WireGuard',
-      version='0.6',
+      version='0.7',
       description='A simple cli to get WARP+ as WireGuard configuration',
       url='https://github.com/warp-plus/warpy-python',
       download_url='https://github.com/warp-plus/warpy-python/archive/v_05.tar.gz',
@@ -12,7 +12,7 @@
       packages=['warpy'],
       install_requires=['pynacl', "requests"],
       entry_points={'console_scripts': [
-            'warpy = warpy.__main__',
+            'warpy = warpy.__main__:main',
         ]},
       classifiers=[
           'Development Status :: 3 - Alpha',      # Chose either "3 - Alpha", "4 - Beta" or "5 - Production/Stable" as the current state of your package

warpy/__main__.py

@@ -57,8 +57,8 @@ def show_user_info(config):
     info = warp_plus.get_info(config["id"], config["token"])
     text = '\nID: {}\n'.format(config['id'])
     text += "Public Key: {}\n".format(config['key']['public_key'])
-    text += "Account Type: {}\n".format(info['result']['account']['account_type'])
-    text += "Quota: {}GB".format(round(int(info['result']['account']['quota']) / (10 ** 9), 2))
+    text += "Account Type: {}\n".format(info['account']['account_type'])
+    text += "Quota: {}GB".format(round(int(info['account']['quota']) / (10 ** 9), 2))
     print(text)
 
 
@@ -168,7 +168,8 @@ def register():
     print(warp_plus.export_to_wireguard(reg))
     warp_plus.increase_quota(reg)
 
-def init():
+
+def main():
     invalid = False
     _input = None
     show_menu()
@@ -205,4 +206,5 @@ def init():
             show_menu()
 
 
-init()
+if __name__ == '__main__':
+    main()

warpy/cli.py renamed to warpy/main.py

@@ -5,7 +5,12 @@
 import requests
 from nacl.bindings import crypto_scalarmult_base
 
-from warpy.utils import generate_string, conf
+from warpy.utils import generate_string, conf, TlsAdapter
+
+api_version = "v0a884"
+
+session = requests.session()
+session.mount("https://", TlsAdapter())
 
 
 class WarpPlus:
@@ -18,49 +23,49 @@ def generate_key():
 
     def enable_warp(self, config):
         data = {"warp_enabled": True}
-        url = 'https://api.cloudflareclient.com/v0a745/reg/' + config['id']
+        url = 'https://api.cloudflareclient.com/' + api_version + '/reg/' + config['id']
         headers = {"Accept-Encoding": "gzip",
                    "User-Agent": "okhttp/3.12.1",
                    "Authorization": "Bearer {}".format(config['token']),
                    "Content-Type": "application/json; charset=UTF-8"}
-        req = requests.patch(url, json=data, headers=headers)
+        req = session.request("PATCH", url, json=data, headers=headers)
         req.raise_for_status()
         req = req.json()
         assert req["warp_enabled"] is True
 
     def register(self, key=None, referrer=None):
 
-        url = 'https://api.cloudflareclient.com/v0a745/reg'
+        url = 'https://api.cloudflareclient.com/' + api_version + '/reg'
 
-        headers = {'Content-Type': 'application/json; charset=UTF-8',
-                   'Host': 'api.cloudflareclient.com',
-                   'Connection': 'Keep-Alive',
-                   'Accept-Encoding': 'gzip',
-                   'User-Agent': 'okhttp/3.12.1'}
+        headers = {"Accept-Encoding": "gzip",
+                   "User-Agent": "okhttp/3.12.1",
+                   "Content-Type": "application/json; charset=UTF-8"}
 
         install_id = generate_string(11)
         key = key if key else self.generate_key()
         data = {"key": key[1],
-                "install_id": install_id,
-                "fcm_token": "{}:APA91b{}".format(install_id, generate_string(134)),
+                "install_id": "",
+                "fcm_token": "",
                 "referrer": referrer or "",
                 "warp_enabled": True,
-                "tos": datetime.datetime.now().isoformat()[:-3] + "+07:00",
+                "tos": datetime.datetime.now().isoformat()[:-7] + "Z",
+                "model": "",
                 "type": "Android",
-                "locale": "en-GB"}
-
-        req = requests.post(url, headers=headers, json=data)
-        req.raise_for_status()
+                "locale": "en_US"}
+        req = session.request('POST', url, headers=headers, json=data)
+        if req.status_code != 200:
+            return {}
         req_json = dict(req.json())
         req_json['key'] = {"public_key": req_json['config']['peers'][0]['public_key'], "private_key": key[0]}
         return req_json
 
     @staticmethod
     def get_info(ID, token):
-        url = 'https://api.cloudflareclient.com/v0i1909221500/reg/' + ID.strip()
+        url = 'https://api.cloudflareclient.com/' + api_version + '/reg/' + ID.strip()
         headers = {"Authorization": "Bearer " + token.strip()}
-        req = requests.get(url, headers=headers)
-        req.raise_for_status()
+        req = session.request("GET", url, headers=headers)
+        if req.status_code != 200:
+            raise Exception(req.text)
         return req.json()
 
     @staticmethod

warpy/utils.py

@@ -1,5 +1,13 @@
 import random
 import string
+from requests.adapters import HTTPAdapter
+from urllib3.poolmanager import PoolManager
+from urllib3.util import ssl_
+
+CIPHERS = (
+    'ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:'
+    'ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:AES256-SHA'
+)
 
 conf = '''
 [Interface]
@@ -11,6 +19,20 @@
 Endpoint = {endpoint}
 AllowedIPs = 0.0.0.0/0'''
 
+
+class TlsAdapter(HTTPAdapter):
+
+    def __init__(self, ssl_options=0, **kwargs):
+        self.ssl_options = ssl_options
+        super(TlsAdapter, self).__init__(**kwargs)
+
+    def init_poolmanager(self, *pool_args, **pool_kwargs):
+        ctx = ssl_.create_urllib3_context(ciphers=CIPHERS, cert_reqs=ssl.CERT_REQUIRED, options=self.ssl_options)
+        self.poolmanager = PoolManager(*pool_args,
+                                       ssl_context=ctx,
+                                       **pool_kwargs)
+
+
 class Colored:
     HEADER = '\033[43;40m'
     PINK = '\033[95m'
@@ -26,4 +48,4 @@ class Colored:
 
 def generate_string(length):
     letters = string.ascii_letters + string.digits
-    return ''.join(random.choice(letters) for _ in range(length))
+    return ''.join(random.choice(letters) for _ in range(length))