monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-11 05:33:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #85 from adam111316/feature/FixApiLogin

Browse source 
Removed requirement for http login for API when an API key is provided
This commit is contained in:
JackDandy 2014-11-03 03:54:51 +00:00
commit 8452471258
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -35,6 +35,7 @@
* Fix proxy_indexers setting not loading from config file * Fix proxy_indexers setting not loading from config file
* Add subtitle information to the cmd show and cmd shows api output * Add subtitle information to the cmd show and cmd shows api output
* Added network logo for SVT * Added network logo for SVT
* Removed requirement for http login for API when an API key is provided
[develop changelog] [develop changelog]
* Improve display of progress bars in the Downloads columns of the show list page * Improve display of progress bars in the Downloads columns of the show list page

6
sickbeard/webserve.py
View file

@ -95,9 +95,11 @@ def authenticated(handler_class):
try: try:
if not (sickbeard.WEB_USERNAME and sickbeard.WEB_PASSWORD): if not (sickbeard.WEB_USERNAME and sickbeard.WEB_PASSWORD):
return True return True
elif (handler.request.uri.startswith('/api') and '/api/builder' not in handler.request.uri): elif (handler.request.uri.startswith(sickbeard.WEB_ROOT + '/api') and
'/api/builder' not in handler.request.uri):
return True return True
elif (handler.request.uri.startswith('/calendar') and sickbeard.CALENDAR_UNPROTECTED): elif (handler.request.uri.startswith(sickbeard.WEB_ROOT + '/calendar') and
sickbeard.CALENDAR_UNPROTECTED):
return True return True
auth_hdr = handler.request.headers.get('Authorization') auth_hdr = handler.request.headers.get('Authorization')