Skip to content

Commit e360823

Browse files
authored
support androidx key (#426)
2 parents 6c4b89e + d34bf44 commit e360823

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

leancloud/engine/authorization.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
APP_ID = os.environ.get('LEANCLOUD_APP_ID')
1919
APP_KEY = os.environ.get('LEANCLOUD_APP_KEY')
20+
ANDX_KEY = os.environ.get('LEANCLOUD_APP_ANDX_KEY')
2021
MASTER_KEY = os.environ.get('LEANCLOUD_APP_MASTER_KEY')
2122
HOOK_KEY = os.environ.get('LEANCLOUD_APP_HOOK_KEY')
2223

@@ -44,7 +45,7 @@ def __call__(self, environ, start_response):
4445
}), status=401, mimetype='application/json')
4546
if app_params['id'] is None:
4647
return unauth_response(environ, start_response)
47-
if (APP_ID == app_params['id']) and (app_params['key'] in [MASTER_KEY, APP_KEY]):
48+
if (APP_ID == app_params['id']) and (app_params['key'] in [MASTER_KEY, APP_KEY, ANDX_KEY]):
4849
return self.app(environ, start_response)
4950
if (APP_ID == app_params['id']) and (app_params['master_key'] == MASTER_KEY):
5051
return self.app(environ, start_response)
@@ -82,10 +83,13 @@ def parse_header(cls, environ):
8283
# key = MASTER_KEY if len(request_sign) == 3 and request_sign[2] == 'master' else APP_KEY
8384
# if sign == utils.sign_by_key(timestamp, key):
8485
# app_key = key
85-
if (len(request_sign) == 3)\
86-
and (request_sign[2] == 'master')\
87-
and (sign == utils.sign_by_key(timestamp, MASTER_KEY)):
88-
master_key = MASTER_KEY
86+
if len(request_sign) == 3:
87+
if ((request_sign[2] == 'master')\
88+
and (sign == utils.sign_by_key(timestamp, MASTER_KEY))):
89+
master_key = MASTER_KEY
90+
elif ((request_sign[2] == 'ax-sig-1')\
91+
and (sign == utils.sign_by_key(timestamp, ANDX_KEY))):
92+
app_key = ANDX_KEY
8993
elif sign == utils.sign_by_key(timestamp, APP_KEY):
9094
app_key = APP_KEY
9195

0 commit comments

Comments
 (0)