MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[plugin/scrobbler] Fixed wrong caching of session key

This commit is contained in:
Agate 2020-08-26 17:27:19 +02:00
parent 84981df52b
commit 122529f473
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/funkwhale_api/contrib/scrobbler/funkwhale_ready.py
View File

@ -1,5 +1,6 @@
from config import plugins import hashlib
from config import plugins
from .funkwhale_startup import PLUGIN from .funkwhale_startup import PLUGIN
from . import scrobbler from . import scrobbler
@ -24,10 +25,14 @@ def forward_to_scrobblers(listening, conf, **kwargs):
and PLUGIN["settings"]["lastfm_api_secret"] and PLUGIN["settings"]["lastfm_api_secret"]
and url == DEFAULT_SCROBBLER_URL and url == DEFAULT_SCROBBLER_URL
): ):
PLUGIN["logger"].info("Forwarding scrobble to %s", LASTFM_SCROBBLER_URL) hashed_auth = hashlib.md5(
session_key = PLUGIN["cache"].get( (username + " " + password).encode("utf-8")
"lastfm:sessionkey:{}".format(listening.user.pk) ).hexdigest()
cache_key = "lastfm:sessionkey:{}".format(
":".join([str(listening.user.pk), hashed_auth])
) )
PLUGIN["logger"].info("Forwarding scrobble to %s", LASTFM_SCROBBLER_URL)
session_key = PLUGIN["cache"].get(cache_key)
if not session_key: if not session_key:
PLUGIN["logger"].debug("Authenticating…") PLUGIN["logger"].debug("Authenticating…")
session_key = scrobbler.handshake_v2( session_key = scrobbler.handshake_v2(
@ -38,9 +43,7 @@ def forward_to_scrobblers(listening, conf, **kwargs):
api_key=PLUGIN["settings"]["lastfm_api_key"], api_key=PLUGIN["settings"]["lastfm_api_key"],
api_secret=PLUGIN["settings"]["lastfm_api_secret"], api_secret=PLUGIN["settings"]["lastfm_api_secret"],
) )
PLUGIN["cache"].set( PLUGIN["cache"].set(cache_key, session_key)
"lastfm:sessionkey:{}".format(listening.user.pk), session_key
)
scrobbler.submit_scrobble_v2( scrobbler.submit_scrobble_v2(
session=session, session=session,
track=listening.track, track=listening.track,