KeyisBClient-mmbp 0.0.0.1.14__tar.gz → 0.0.0.1.16__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. {keyisbclient_mmbp-0.0.0.1.14 → keyisbclient_mmbp-0.0.0.1.16}/KeyisBClient_mmbp/KeyisBClient_mmbp/Client.py +21 -2
  2. {keyisbclient_mmbp-0.0.0.1.14 → keyisbclient_mmbp-0.0.0.1.16}/KeyisBClient_mmbp/KeyisBClient_mmbp.egg-info/PKG-INFO +1 -1
  3. {keyisbclient_mmbp-0.0.0.1.14 → keyisbclient_mmbp-0.0.0.1.16}/PKG-INFO +1 -1
  4. {keyisbclient_mmbp-0.0.0.1.14 → keyisbclient_mmbp-0.0.0.1.16}/setup.py +1 -1
  5. {keyisbclient_mmbp-0.0.0.1.14 → keyisbclient_mmbp-0.0.0.1.16}/KeyisBClient_mmbp/KeyisBClient_mmbp/__init__.py +0 -0
  6. {keyisbclient_mmbp-0.0.0.1.14 → keyisbclient_mmbp-0.0.0.1.16}/KeyisBClient_mmbp/KeyisBClient_mmbp/gw_certs/__init__.py +0 -0
  7. {keyisbclient_mmbp-0.0.0.1.14 → keyisbclient_mmbp-0.0.0.1.16}/KeyisBClient_mmbp/KeyisBClient_mmbp/gw_certs/v0.0.1.crt +0 -0
  8. {keyisbclient_mmbp-0.0.0.1.14 → keyisbclient_mmbp-0.0.0.1.16}/KeyisBClient_mmbp/KeyisBClient_mmbp.egg-info/SOURCES.txt +0 -0
  9. {keyisbclient_mmbp-0.0.0.1.14 → keyisbclient_mmbp-0.0.0.1.16}/KeyisBClient_mmbp/KeyisBClient_mmbp.egg-info/dependency_links.txt +0 -0
  10. {keyisbclient_mmbp-0.0.0.1.14 → keyisbclient_mmbp-0.0.0.1.16}/KeyisBClient_mmbp/KeyisBClient_mmbp.egg-info/requires.txt +0 -0
  11. {keyisbclient_mmbp-0.0.0.1.14 → keyisbclient_mmbp-0.0.0.1.16}/KeyisBClient_mmbp/KeyisBClient_mmbp.egg-info/top_level.txt +0 -0
  12. {keyisbclient_mmbp-0.0.0.1.14 → keyisbclient_mmbp-0.0.0.1.16}/KeyisBClient_mmbp/LICENSE +0 -0
  13. {keyisbclient_mmbp-0.0.0.1.14 → keyisbclient_mmbp-0.0.0.1.16}/KeyisBClient_mmbp/mmbConfig.json +0 -0
  14. {keyisbclient_mmbp-0.0.0.1.14 → keyisbclient_mmbp-0.0.0.1.16}/LICENSE +0 -0
  15. {keyisbclient_mmbp-0.0.0.1.14 → keyisbclient_mmbp-0.0.0.1.16}/MANIFEST.in +0 -0
  16. {keyisbclient_mmbp-0.0.0.1.14 → keyisbclient_mmbp-0.0.0.1.16}/setup.cfg +0 -0
@@ -46,6 +46,8 @@ class Client:
46
46
  logging.debug("No DNS record found")
47
47
  raise Exceptions.DNS.InvalidDNSError()
48
48
 
49
+ request_url = Url(str(request.url))
50
+
49
51
  request.url.hostname = request.dnsObject.host() # type: ignore
50
52
  request.url.scheme = request.dnsObject.protocolInfo()['connection_protocol']
51
53
 
@@ -69,6 +71,13 @@ class Client:
69
71
  json = response.json()
70
72
  except:
71
73
  json = None
74
+
75
+ response_url = Url(str(response.url))
76
+ if response_url.hostname == request.dnsObject.host():
77
+ response_url.hostname = request_url.hostname
78
+ if response_url.scheme == request.dnsObject.protocolInfo()['connection_protocol']:
79
+ response_url.scheme = request_url.scheme
80
+
72
81
  return Response(
73
82
  status_code=response.status_code,
74
83
  headers=response.headers,
@@ -80,7 +89,7 @@ class Client:
80
89
  extensions=response.extensions,
81
90
  history=None,
82
91
  default_encoding=response.encoding or "utf-8",
83
- url=Url(str(response.url))
92
+ url=response_url
84
93
  )
85
94
  except httpx.TimeoutException:
86
95
  logging.debug("HTTPS request timed out")
@@ -102,6 +111,8 @@ class Client:
102
111
  logging.debug("No DNS record found")
103
112
  raise Exceptions.DNS.InvalidDNSError()
104
113
 
114
+ request_url = Url(str(request.url))
115
+
105
116
  request.url.hostname = request.dnsObject.host() # type: ignore
106
117
  request.url.scheme = request.dnsObject.protocolInfo()['connection_protocol']
107
118
 
@@ -126,6 +137,14 @@ class Client:
126
137
  json = response.json()
127
138
  except:
128
139
  json = None
140
+
141
+
142
+ response_url = Url(str(response.url))
143
+ if response_url.hostname == request.dnsObject.host():
144
+ response_url.hostname = request_url.hostname
145
+ if response_url.scheme == request.dnsObject.protocolInfo()['connection_protocol']:
146
+ response_url.scheme = request_url.scheme
147
+
129
148
  return Response(
130
149
  status_code=response.status_code,
131
150
  headers=response.headers,
@@ -137,7 +156,7 @@ class Client:
137
156
  extensions=response.extensions,
138
157
  history=None,
139
158
  default_encoding=response.encoding or "utf-8",
140
- url=Url(str(response.url))
159
+ url=response_url
141
160
  )
142
161
  except httpx.TimeoutException:
143
162
  logging.debug("HTTPS request timed out")
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: KeyisBClient_mmbp
3
- Version: 0.0.0.1.14
3
+ Version: 0.0.0.1.16
4
4
  Summary: KeyisBClient_mmbp
5
5
  Home-page: https://github.com/KeyisB/libs/tree/main/KeyisBClient_mmbp
6
6
  Author: KeyisB
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: KeyisBClient_mmbp
3
- Version: 0.0.0.1.14
3
+ Version: 0.0.0.1.16
4
4
  Summary: KeyisBClient_mmbp
5
5
  Home-page: https://github.com/KeyisB/libs/tree/main/KeyisBClient_mmbp
6
6
  Author: KeyisB
@@ -4,7 +4,7 @@ name = 'KeyisBClient_mmbp'
4
4
 
5
5
  setup(
6
6
  name=name,
7
- version='0.0.0.1.14',
7
+ version='0.0.0.1.16',
8
8
  author="KeyisB",
9
9
  author_email="keyisb.pip@gmail.com",
10
10
  description=name,