Commit d66c72ad authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/10.0.63'

parents 332eda0c c3813b23
......@@ -2,8 +2,14 @@
 
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
#### [10.0.63](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.62...10.0.63)
- refactored log level of rarbg provider to debug for rarbg api returned errors [`619e864`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/619e8648e4329e3eacad102bcc9e9801e3ebde40)
#### [10.0.62](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.61...10.0.62)
 
> 9 May 2022
#### [10.0.61](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.60...10.0.61)
 
> 8 May 2022
......
{
"name": "sickrage",
"version": "10.0.62",
"version": "10.0.63",
"private": true,
"repository": {
"type": "git",
......
[bumpversion]
current_version = 10.0.62
current_version = 10.0.63
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
......
......@@ -19,7 +19,7 @@
# along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>.
# ##############################################################################
__version__ = "10.0.62"
__version__ = "10.0.63"
__install_type__ = ""
import argparse
......
This diff is collapsed.
......@@ -28,6 +28,11 @@ from keycloak.realm import KeycloakRealm
import sickrage
class KeycloakOpenidConnectCustom(KeycloakOpenidConnect):
def get_path_well_known(self):
return "realms/{}/.well-known/openid-configuration"
class AuthServer(object):
__server = {}
__client = {}
......@@ -46,7 +51,7 @@ class AuthServer(object):
def health(self):
for i in range(3):
try:
health = requests.get("{base}/auth/realms/{realm}".format(base=self.server_url, realm=self.server_realm), verify=False, timeout=30).ok
health = requests.get("{base}/realms/{realm}".format(base=self.server_url, realm=self.server_realm), verify=False, timeout=30).ok
except (requests.exceptions.ConnectionError, requests.exceptions.ReadTimeout):
pass
else:
......@@ -81,7 +86,7 @@ class AuthServer(object):
return self.client.logout(*args, **kwargs)
def decode_token(self, *args, **kwargs):
return self.client.decode_token(*args, **kwargs)
return self.client.decode_token(*args, **kwargs, audience='sickrage-api')
def refresh_token(self, *args, **kwargs):
if not self.health:
......@@ -111,7 +116,7 @@ class AuthServer(object):
def __get_client(self) -> KeycloakOpenidConnect:
client = self.__client.get('client', None)
if client is None:
self.__client.update({'client': self.__get_server().open_id_connect(self.client_id, '')})
self.__client.update({'client': KeycloakOpenidConnectCustom(self.__get_server(), self.client_id, '')})
client = self.__client.get('client', None)
return client
......
......@@ -18,7 +18,7 @@
# You should have received a copy of the GNU General Public License
# along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>.
# ##############################################################################
from urllib.parse import urlencode
import sickrage
from sickrage.core.webserver.handlers.base import BaseHandler
......@@ -34,6 +34,13 @@ class LogoutHandler(BaseHandler):
self.clear_cookie('_sr_refresh_token')
if logout_uri:
return self.redirect(f'{logout_uri}?redirect_uri={redirect_uri}', add_web_root=False)
# logout_args = {
# 'post_logout_redirect_uri': redirect_uri,
# 'id_token_hint': sickrage.app.api.token['access_token'],
# 'state': sickrage.app.api.token['session_state'],
# }
#
# return self.redirect(f'{logout_uri}?{urlencode(logout_args)}', add_web_root=False)
return self.redirect(f'{logout_uri}', add_web_root=False)
else:
return self.redirect(f'{redirect_uri}', add_web_root=False)
......@@ -81729,7 +81729,7 @@ var debugs = {};
var debugEnviron;
exports.debuglog = function(set) {
if (isUndefined(debugEnviron))
debugEnviron = Object({"SENTRY_DSN":'https://[email protected]/2',"PACKAGE_VERSION":"10.0.62"}).NODE_DEBUG || '';
debugEnviron = Object({"SENTRY_DSN":'https://[email protected]/2',"PACKAGE_VERSION":"10.0.63"}).NODE_DEBUG || '';
set = set.toUpperCase();
if (!debugs[set]) {
if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) {
......@@ -82538,7 +82538,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
Sentry.init({
dsn: 'https://[email protected]/2',
release: "10.0.62",
release: "10.0.63",
beforeSend: function beforeSend(event, hint) {
if (event.exception) {
event.exception.values[0].stacktrace.frames.forEach(function (frame) {
......@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: sickrage 10.0.62.dev2\n"
"Project-Id-Version: sickrage 10.0.63.dev1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2022-05-09 07:43+0000\n"
"PO-Revision-Date: 2022-05-09 07:43+0000\n"
"POT-Creation-Date: 2022-06-02 17:33+0000\n"
"PO-Revision-Date: 2022-06-02 17:33+0000\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language: en_US\n"
"Language-Team: en_US <[email protected]>\n"
......
......@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: sickrage 10.0.62.dev2\n"
"Project-Id-Version: sickrage 10.0.63.dev1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2022-05-09 07:43+0000\n"
"POT-Creation-Date: 2022-06-02 17:33+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
......
......@@ -155,16 +155,16 @@ class RarbgProvider(TorrentProvider):
# List of errors: https://github.com/rarbg/torrentapi/issues/1#issuecomment-114763312
if error_code == 5:
# 5 = Too many requests per second
log_level = sickrage.app.log.INFO
log_level = sickrage.app.log.DEBUG
retries -= 1
elif error_code not in (8, 10, 12, 14, 20):
# 8, 10, 12, 14 = Cant find * in database. Are you sure this * exists?
# 20 = No results found
log_level = sickrage.app.log.WARNING
log_level = sickrage.app.log.DEBUG
retries = 0
elif error_code not in (2, 4):
# 2, 4 = Invalid token. Use get_token for a new one!
log_level = sickrage.app.log.WARNING
log_level = sickrage.app.log.DEBUG
retries -= 1
else:
log_level = sickrage.app.log.DEBUG
......
10.0.62
\ No newline at end of file
10.0.63
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment