Skip to content

Commit 811f9dc

Browse files
adamtheturtleadamtheturtle
committed
Use string everywhere a human touches
1 parent 381e141 commit 811f9dc

File tree

9 files changed

+70
-82
lines changed

9 files changed

+70
-82
lines changed

‎src/mock_vws/_mock_common.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ def get_database_matching_client_keys(
194194

195195
for database in databases:
196196
expected_authorization_header = authorization_header(
197-
access_key=database.client_access_key.decode(),
198-
secret_key=database.client_secret_key.decode(),
197+
access_key=database.client_access_key,
198+
secret_key=database.client_secret_key,
199199
method=request.method,
200200
content=request.body or b'',
201201
content_type=content_type,
@@ -225,8 +225,8 @@ def get_database_matching_server_keys(
225225

226226
for database in databases:
227227
expected_authorization_header = authorization_header(
228-
access_key=database.server_access_key.decode(),
229-
secret_key=database.server_secret_key.decode(),
228+
access_key=database.server_access_key,
229+
secret_key=database.server_secret_key,
230230
method=request.method,
231231
content=request.body or b'',
232232
content_type=content_type,

‎src/mock_vws/_query_validators/auth_validators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def validate_client_key_exists(
109109
first_part, _ = header.split(b':')
110110
_, access_key = first_part.split(b' ')
111111
for database in instance.databases:
112-
if access_key == database.client_access_key:
112+
if access_key == database.client_access_key.encode():
113113
return wrapped(*args, **kwargs)
114114

115115
context.status_code = codes.UNAUTHORIZED

‎src/mock_vws/_services_validators/auth_validators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def validate_access_key_exists(
7373
first_part, _ = header.split(b':')
7474
_, access_key = first_part.split(b' ')
7575
for database in instance.databases:
76-
if access_key == database.server_access_key:
76+
if access_key == database.server_access_key.encode():
7777
return wrapped(*args, **kwargs)
7878

7979
context.status_code = codes.BAD_REQUEST

‎src/mock_vws/database.py

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ class VuforiaDatabase:
1515
"""
1616

1717
database_name: str
18-
server_access_key: bytes
19-
server_secret_key: bytes
20-
client_access_key: bytes
21-
client_secret_key: bytes
18+
server_access_key: str
19+
server_secret_key: str
20+
client_access_key: str
21+
client_secret_key: str
2222
targets: List[Target]
2323
state: States
2424

@@ -66,22 +66,10 @@ def __init__(
6666
if client_secret_key is None:
6767
client_secret_key = uuid.uuid4().hex
6868

69-
self.server_access_key: bytes = bytes(
70-
server_access_key,
71-
encoding='utf-8',
72-
)
73-
self.server_secret_key: bytes = bytes(
74-
server_secret_key,
75-
encoding='utf-8',
76-
)
77-
self.client_access_key: bytes = bytes(
78-
client_access_key,
79-
encoding='utf-8',
80-
)
81-
self.client_secret_key: bytes = bytes(
82-
client_secret_key,
83-
encoding='utf-8',
84-
)
69+
self.server_access_key = server_access_key
70+
self.server_secret_key = server_secret_key
71+
self.client_access_key = client_access_key
72+
self.client_secret_key = client_secret_key
8573
self.database_name = database_name
8674
self.targets: List[Target] = []
8775
self.state = state

‎tests/conftest.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,19 +133,19 @@ def verify_mock_vuforia(
133133

134134
working_database = VuforiaDatabase(
135135
database_name=vuforia_database.database_name,
136-
server_access_key=vuforia_database.server_access_key.decode('ascii'),
137-
server_secret_key=vuforia_database.server_secret_key.decode('ascii'),
138-
client_access_key=vuforia_database.client_access_key.decode('ascii'),
139-
client_secret_key=vuforia_database.client_secret_key.decode('ascii'),
136+
server_access_key=vuforia_database.server_access_key,
137+
server_secret_key=vuforia_database.server_secret_key,
138+
client_access_key=vuforia_database.client_access_key,
139+
client_secret_key=vuforia_database.client_secret_key,
140140
)
141141

142142
inactive_database = VuforiaDatabase(
143143
state=States.PROJECT_INACTIVE,
144144
database_name=inactive_database.database_name,
145-
server_access_key=inactive_database.server_access_key.decode('ascii'),
146-
server_secret_key=inactive_database.server_secret_key.decode('ascii'),
147-
client_access_key=inactive_database.client_access_key.decode('ascii'),
148-
client_secret_key=inactive_database.client_secret_key.decode('ascii'),
145+
server_access_key=inactive_database.server_access_key,
146+
server_secret_key=inactive_database.server_secret_key,
147+
client_access_key=inactive_database.client_access_key,
148+
client_secret_key=inactive_database.client_secret_key,
149149
)
150150
if use_real_vuforia:
151151
_delete_all_targets(database_keys=vuforia_database)

‎tests/mock_vws/fixtures/prepared_requests.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ def _add_target(
4949

5050
content = bytes(json.dumps(data), encoding='utf-8')
5151

52-
access_key = vuforia_database.server_access_key.decode()
53-
secret_key = vuforia_database.server_secret_key.decode()
52+
access_key = vuforia_database.server_access_key
53+
secret_key = vuforia_database.server_secret_key
5454
authorization_string = authorization_header(
5555
access_key=access_key,
5656
secret_key=secret_key,
@@ -102,8 +102,8 @@ def _delete_target(
102102
method = DELETE
103103
content = b''
104104

105-
access_key = vuforia_database.server_access_key.decode()
106-
secret_key = vuforia_database.server_secret_key.decode()
105+
access_key = vuforia_database.server_access_key
106+
secret_key = vuforia_database.server_secret_key
107107
authorization_string = authorization_header(
108108
access_key=access_key,
109109
secret_key=secret_key,
@@ -147,8 +147,8 @@ def _database_summary(vuforia_database: VuforiaDatabase) -> Endpoint:
147147

148148
content = b''
149149

150-
access_key = vuforia_database.server_access_key.decode()
151-
secret_key = vuforia_database.server_secret_key.decode()
150+
access_key = vuforia_database.server_access_key
151+
secret_key = vuforia_database.server_secret_key
152152
authorization_string = authorization_header(
153153
access_key=access_key,
154154
secret_key=secret_key,
@@ -201,8 +201,8 @@ def _get_duplicates(
201201

202202
content = b''
203203

204-
access_key = vuforia_database.server_access_key.decode()
205-
secret_key = vuforia_database.server_secret_key.decode()
204+
access_key = vuforia_database.server_access_key
205+
secret_key = vuforia_database.server_secret_key
206206
authorization_string = authorization_header(
207207
access_key=access_key,
208208
secret_key=secret_key,
@@ -254,8 +254,8 @@ def _get_target(
254254

255255
content = b''
256256

257-
access_key = vuforia_database.server_access_key.decode()
258-
secret_key = vuforia_database.server_secret_key.decode()
257+
access_key = vuforia_database.server_access_key
258+
secret_key = vuforia_database.server_secret_key
259259
authorization_string = authorization_header(
260260
access_key=access_key,
261261
secret_key=secret_key,
@@ -300,8 +300,8 @@ def _target_list(vuforia_database: VuforiaDatabase) -> Endpoint:
300300

301301
content = b''
302302

303-
access_key = vuforia_database.server_access_key.decode()
304-
secret_key = vuforia_database.server_secret_key.decode()
303+
access_key = vuforia_database.server_access_key
304+
secret_key = vuforia_database.server_secret_key
305305
authorization_string = authorization_header(
306306
access_key=access_key,
307307
secret_key=secret_key,
@@ -353,8 +353,8 @@ def _target_summary(
353353

354354
content = b''
355355

356-
access_key = vuforia_database.server_access_key.decode()
357-
secret_key = vuforia_database.server_secret_key.decode()
356+
access_key = vuforia_database.server_access_key
357+
secret_key = vuforia_database.server_secret_key
358358
authorization_string = authorization_header(
359359
access_key=access_key,
360360
secret_key=secret_key,
@@ -408,8 +408,8 @@ def _update_target(
408408
date = rfc_1123_date()
409409
method = PUT
410410

411-
access_key = vuforia_database.server_access_key.decode()
412-
secret_key = vuforia_database.server_secret_key.decode()
411+
access_key = vuforia_database.server_access_key
412+
secret_key = vuforia_database.server_secret_key
413413
authorization_string = authorization_header(
414414
access_key=access_key,
415415
secret_key=secret_key,
@@ -460,8 +460,8 @@ def _query(
460460

461461
content, content_type_header = encode_multipart_formdata(files)
462462

463-
access_key = vuforia_database.client_access_key.decode()
464-
secret_key = vuforia_database.client_secret_key.decode()
463+
access_key = vuforia_database.client_access_key
464+
secret_key = vuforia_database.client_secret_key
465465
authorization_string = authorization_header(
466466
access_key=access_key,
467467
secret_key=secret_key,

‎tests/mock_vws/test_authorization_header.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ def test_bad_access_key_services(
193193
``Fail`` response is returned.
194194
"""
195195
keys = vuforia_database
196-
keys.server_access_key = b'example'
196+
keys.server_access_key = 'example'
197197
response = get_vws_target(
198198
target_id=uuid.uuid4().hex,
199199
vuforia_database=keys,
@@ -214,7 +214,7 @@ def test_bad_access_key_query(
214214
If the client access key given is incorrect, an
215215
``UNAUTHORIZED`` response is returned.
216216
"""
217-
vuforia_database.client_access_key = b'example'
217+
vuforia_database.client_access_key = 'example'
218218
image_content = high_quality_image.getvalue()
219219
body = {'image': ('image.jpeg', image_content, 'image/jpeg')}
220220

@@ -253,7 +253,7 @@ def test_bad_secret_key_services(
253253
``AuthenticationFailure`` response is returned.
254254
"""
255255
keys = vuforia_database
256-
keys.server_secret_key = b'example'
256+
keys.server_secret_key = 'example'
257257
response = get_vws_target(
258258
target_id=uuid.uuid4().hex,
259259
vuforia_database=keys,
@@ -274,7 +274,7 @@ def test_bad_secret_key_query(
274274
If the client secret key given is incorrect, an
275275
``UNAUTHORIZED`` response is returned.
276276
"""
277-
vuforia_database.client_secret_key = b'example'
277+
vuforia_database.client_secret_key = 'example'
278278
image_content = high_quality_image.getvalue()
279279
body = {'image': ('image.jpeg', image_content, 'image/jpeg')}
280280

‎tests/mock_vws/test_query.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ def test_incorrect_no_boundary(
7575
content, _ = encode_multipart_formdata(body)
7676
method = POST
7777

78-
access_key = vuforia_database.client_access_key.decode()
79-
secret_key = vuforia_database.client_secret_key.decode()
78+
access_key = vuforia_database.client_access_key
79+
secret_key = vuforia_database.client_secret_key
8080
authorization_string = authorization_header(
8181
access_key=access_key,
8282
secret_key=secret_key,
@@ -126,8 +126,8 @@ def test_incorrect_with_boundary(
126126

127127
content_type = 'text/html'
128128

129-
access_key = vuforia_database.client_access_key.decode()
130-
secret_key = vuforia_database.client_secret_key.decode()
129+
access_key = vuforia_database.client_access_key
130+
secret_key = vuforia_database.client_secret_key
131131
authorization_string = authorization_header(
132132
access_key=access_key,
133133
secret_key=secret_key,
@@ -185,8 +185,8 @@ def test_no_boundary(
185185
content, _ = encode_multipart_formdata(body)
186186
method = POST
187187

188-
access_key = vuforia_database.client_access_key.decode()
189-
secret_key = vuforia_database.client_secret_key.decode()
188+
access_key = vuforia_database.client_access_key
189+
secret_key = vuforia_database.client_secret_key
190190
authorization_string = authorization_header(
191191
access_key=access_key,
192192
secret_key=secret_key,
@@ -237,8 +237,8 @@ def test_bogus_boundary(
237237
content, _ = encode_multipart_formdata(body)
238238
method = POST
239239

240-
access_key = vuforia_database.client_access_key.decode()
241-
secret_key = vuforia_database.client_secret_key.decode()
240+
access_key = vuforia_database.client_access_key
241+
secret_key = vuforia_database.client_secret_key
242242
authorization_string = authorization_header(
243243
access_key=access_key,
244244
secret_key=secret_key,
@@ -290,8 +290,8 @@ def test_extra_section(
290290
content, content_type_header = encode_multipart_formdata(body)
291291
method = POST
292292

293-
access_key = vuforia_database.client_access_key.decode()
294-
secret_key = vuforia_database.client_secret_key.decode()
293+
access_key = vuforia_database.client_access_key
294+
secret_key = vuforia_database.client_secret_key
295295
authorization_string = authorization_header(
296296
access_key=access_key,
297297
secret_key=secret_key,
@@ -891,8 +891,8 @@ def test_valid(
891891
content, content_type_header = encode_multipart_formdata(body)
892892
method = POST
893893

894-
access_key = vuforia_database.client_access_key.decode()
895-
secret_key = vuforia_database.client_secret_key.decode()
894+
access_key = vuforia_database.client_access_key
895+
secret_key = vuforia_database.client_secret_key
896896
authorization_string = authorization_header(
897897
access_key=access_key,
898898
secret_key=secret_key,
@@ -936,8 +936,8 @@ def test_invalid(
936936
content, content_type_header = encode_multipart_formdata(body)
937937
method = POST
938938

939-
access_key = vuforia_database.client_access_key.decode()
940-
secret_key = vuforia_database.client_secret_key.decode()
939+
access_key = vuforia_database.client_access_key
940+
secret_key = vuforia_database.client_secret_key
941941
authorization_string = authorization_header(
942942
access_key=access_key,
943943
secret_key=secret_key,
@@ -1737,8 +1737,8 @@ def test_date_formats(
17371737
content, content_type_header = encode_multipart_formdata(body)
17381738
method = POST
17391739

1740-
access_key = vuforia_database.client_access_key.decode()
1741-
secret_key = vuforia_database.client_secret_key.decode()
1740+
access_key = vuforia_database.client_access_key
1741+
secret_key = vuforia_database.client_secret_key
17421742
authorization_string = authorization_header(
17431743
access_key=access_key,
17441744
secret_key=secret_key,

‎tests/mock_vws/utils/__init__.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ def add_target_to_vws(
9999
content = bytes(json.dumps(data), encoding='utf-8')
100100

101101
authorization_string = authorization_header(
102-
access_key=vuforia_database.server_access_key.decode(),
103-
secret_key=vuforia_database.server_secret_key.decode(),
102+
access_key=vuforia_database.server_access_key,
103+
secret_key=vuforia_database.server_secret_key,
104104
method=POST,
105105
content=content,
106106
content_type=content_type,
@@ -201,8 +201,8 @@ def wait_for_target_processed(
201201

202202

203203
def target_api_request(
204-
server_access_key: bytes,
205-
server_secret_key: bytes,
204+
server_access_key: str,
205+
server_secret_key: str,
206206
method: str,
207207
content: bytes,
208208
request_path: str,
@@ -228,8 +228,8 @@ def target_api_request(
228228
content_type = 'application/json'
229229

230230
signature_string = authorization_header(
231-
access_key=server_access_key.decode(),
232-
secret_key=server_secret_key.decode(),
231+
access_key=server_access_key,
232+
secret_key=server_secret_key,
233233
method=method,
234234
content=content,
235235
content_type=content_type,
@@ -306,8 +306,8 @@ def update_target(
306306
content = bytes(json.dumps(data), encoding='utf-8')
307307

308308
authorization_string = authorization_header(
309-
access_key=vuforia_database.server_access_key.decode(),
310-
secret_key=vuforia_database.server_secret_key.decode(),
309+
access_key=vuforia_database.server_access_key,
310+
secret_key=vuforia_database.server_secret_key,
311311
method=PUT,
312312
content=content,
313313
content_type=content_type,
@@ -399,8 +399,8 @@ def query(
399399
content, content_type_header = encode_multipart_formdata(body)
400400
method = POST
401401

402-
access_key = vuforia_database.client_access_key.decode()
403-
secret_key = vuforia_database.client_secret_key.decode()
402+
access_key = vuforia_database.client_access_key
403+
secret_key = vuforia_database.client_secret_key
404404
authorization_string = authorization_header(
405405
access_key=access_key,
406406
secret_key=secret_key,

0 commit comments

Comments
 (0)