alex/anki-connect
1
Fork 0
Code Releases 7 Activity

Deprecate field 'webCorsOrigin' but keep temporary support for it.

Browse Source
This commit is contained in:
Yannick Mau 2020-02-28 01:17:53 +01:00
parent 413b27a21e
commit 002b7cbf97
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugin/config.json
View File

@ -3,5 +3,6 @@
"apiLogPath": null, "apiLogPath": null,
"webBindAddress": "127.0.0.1", "webBindAddress": "127.0.0.1",
"webBindPort": 8765, "webBindPort": 8765,
"webCorsOrigin": ["http://localhost"] "webCorsOrigin": "http://localhost",
"webCorsOriginList": ["http://localhost"]
} }

1
plugin/util.py
View File

@ -54,6 +54,7 @@ def setting(key):
'webBindAddress': os.getenv('ANKICONNECT_BIND_ADDRESS', '127.0.0.1'), 'webBindAddress': os.getenv('ANKICONNECT_BIND_ADDRESS', '127.0.0.1'),
'webBindPort': 8765, 'webBindPort': 8765,
'webCorsOrigin': os.getenv('ANKICONNECT_CORS_ORIGIN', 'http://localhost'), 'webCorsOrigin': os.getenv('ANKICONNECT_CORS_ORIGIN', 'http://localhost'),
'webCorsOriginList': ['http://localhost'],
'webTimeout': 10000, 'webTimeout': 10000,
} }

20
plugin/web.py
View File

@ -154,13 +154,19 @@ class WebServer:
body = json.dumps(None).encode('utf-8') body = json.dumps(None).encode('utf-8')
# handle multiple cors origins by checking the 'origin'-header against the allowed origin list from the config # handle multiple cors origins by checking the 'origin'-header against the allowed origin list from the config
webCorsOriginsSetting = util.setting('webCorsOrigin') webCorsOriginList = util.setting('webCorsOriginList')
corsOrigin = "http://localhost"
if len(webCorsOriginsSetting) == 1: # keep support for deprecated 'webCorsOrigin' field, as long it is not removed
corsOrigin = webCorsOriginsSetting[0] webCorsOrigin = util.setting('webCorsOrigin')
elif b"origin" in req.headers: if webCorsOrigin:
originStr = req.headers[b"origin"].decode() webCorsOriginList.append(webCorsOrigin)
if originStr in webCorsOriginsSetting:
corsOrigin = 'http://localhost'
if len(webCorsOriginList) == 1:
corsOrigin = webCorsOriginList[0]
elif b'origin' in req.headers:
originStr = req.headers[b'origin'].decode()
if originStr in webCorsOriginList:
corsOrigin = originStr corsOrigin = originStr
headers = [ headers = [