linkkf 로직수정중
This commit is contained in:
@@ -13,13 +13,13 @@ def check_api(original_function):
|
||||
#logger.warning(request.url)
|
||||
#logger.warning(request.form)
|
||||
try:
|
||||
if F.SystemModelSetting.get_bool('auth_use_apikey'):
|
||||
if request.method == 'POST':
|
||||
apikey = request.form['apikey']
|
||||
else:
|
||||
apikey = request.args.get('apikey')
|
||||
#apikey = request.args.get('apikey')
|
||||
if apikey is None or apikey != F.SystemModelSetting.get('auth_apikey'):
|
||||
if F.SystemModelSetting.get_bool('use_apikey'):
|
||||
try:
|
||||
d = request.get_json()
|
||||
except Exception:
|
||||
d = request.form.to_dict() if request.method == 'POST' else request.args.to_dict()
|
||||
apikey = d.get('apikey')
|
||||
if apikey is None or apikey != F.SystemModelSetting.get('apikey'):
|
||||
F.logger.warning('CHECK API : ABORT no match ({})'.format(apikey))
|
||||
F.logger.warning(request.environ.get('HTTP_X_REAL_IP', request.remote_addr))
|
||||
abort(403)
|
||||
@@ -31,7 +31,7 @@ def check_api(original_function):
|
||||
return original_function(*args, **kwargs) #2
|
||||
return wrapper_function
|
||||
|
||||
# Suuport를 logger 생성전에 쓰지 않기 위해 중복 선언
|
||||
# Support를 logger 생성전에 쓰지 않기 위해 중복 선언
|
||||
import logging
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ class CustomFormatter(logging.Formatter):
|
||||
# pathname filename
|
||||
#format = "[%(asctime)s|%(name)s|%(levelname)s - %(message)s (%(filename)s:%(lineno)d)"
|
||||
|
||||
__format = '[{yellow}%(asctime)s{reset}|{color}%(levelname)s{reset}|{green}%(name)s{reset} %(pathname)s:%(lineno)s] {color}%(message)s{reset}' if os.environ.get('LOGGER_PATHNAME', "False") == "True" else '[{yellow}%(asctime)s{reset}|{color}%(levelname)s{reset}|{green}%(name)s{reset} %(filename)s:%(lineno)s] {color}%(message)s{reset}'
|
||||
__format = '[{yellow}%(asctime)s{reset}|{color}%(levelname)s{reset}|{green}%(name)s{reset}|%(pathname)s:%(lineno)s] {color}%(message)s{reset}' if os.environ.get('LOGGER_PATHNAME', "False") == "True" else '[{yellow}%(asctime)s{reset}|{color}%(levelname)s{reset}|{green}%(name)s{reset}|%(filename)s:%(lineno)s] {color}%(message)s{reset}'
|
||||
|
||||
FORMATS = {
|
||||
logging.DEBUG: __format.format(color=grey, reset=reset, yellow=yellow, green=green),
|
||||
|
||||
Reference in New Issue
Block a user