Skip to content

Commit 3a96aec

Browse files
екн ершы
1 parent b47ab53 commit 3a96aec

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

Diff for: tarantool/connection.py

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
IPROTO_FEATURE_TRANSACTIONS,
6868
IPROTO_FEATURE_ERROR_EXTENSION,
6969
IPROTO_FEATURE_WATCHERS,
70+
IPROTO_AUTH_TYPE,
7071
IPROTO_CHUNK,
7172
DEFAULT_AUTH_TYPE,
7273
AUTH_TYPE_CHAP_SHA1,

Diff for: tarantool/request.py

+9-10
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,15 @@ def __init__(self, conn, space_no, values):
225225

226226
self._body = request_body
227227

228+
def sha1(values):
229+
sha = hashlib.sha1()
230+
for i in values:
231+
if i is not None:
232+
if isinstance(i, bytes):
233+
sha.update(i)
234+
else:
235+
sha.update(i.encode())
236+
return sha.digest()
228237

229238
class RequestAuthenticate(Request):
230239
"""
@@ -252,16 +261,6 @@ def __init__(self, conn, salt, user, password, auth_type):
252261

253262
super(RequestAuthenticate, self).__init__(conn)
254263

255-
def sha1(values):
256-
sha = hashlib.sha1()
257-
for i in values:
258-
if i is not None:
259-
if isinstance(i, bytes):
260-
sha.update(i)
261-
else:
262-
sha.update(i.encode())
263-
return sha.digest()
264-
265264
if auth_type == AUTH_TYPE_CHAP_SHA1:
266265
hash1 = sha1((password,))
267266
hash2 = sha1((hash1,))

Diff for: tarantool/response.py

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
IPROTO_SQL_INFO_AUTOINCREMENT_IDS,
2222
IPROTO_VERSION,
2323
IPROTO_FEATURES,
24+
IPROTO_AUTH_TYPE,
2425
)
2526
from tarantool.types import decode_box_error
2627
from tarantool.error import (

0 commit comments

Comments
 (0)