hotfix the hotfix of the hotfix

README.md

@@ -48,17 +48,17 @@ Extra functionality for further development of features.
 - [x] Video reporting functionality
 - [x] Ability (for external applications) to queue up video ids for download
 - [x] Add websub requesting and receiving ability. (not fully usable yet without celery tasks)
-- [] OIDC or Webauthn logins instead of static argon2 passwords
+- [x] OIDC or Webauthn logins instead of static argon2 passwords
 
 ### Stage 3
 Mainly focused on retiring the cronjob based scripts and moving it to celery based tasks
-- [] manage videos by ID's instead of per channel basis
-- [] download videos from queue
-- [] Manage websub callbacks
+- [ ] manage videos by ID's instead of per channel basis
+- [ ] download videos from queue
+- [ ] Manage websub callbacks
 
 ### Stage 4
 Mongodb finally has it's limitations.
-- [] Migrate to postgresql
+- [ ] Migrate to postgresql
 
 ### Stage ...
 Since this is my flagship software which I have developed more features will be added.

ayta/blueprints/channel.py

@@ -34,7 +34,7 @@ def channel(channelId):
     for videoId in videoIds:
         videos.append(get_nosql().get_video_info(videoId, limited=True))
         
-    videos = sorted(videos, key=lambda x: x.get('upload_date'), reverse=True)
+    videos = sorted(videos, key=lambda x: x.get('upload_date', '19700101'), reverse=True)
 
     return render_template('channel/channel.html', channel=channelInfo, videos=videos)
     

ayta/nosql.py

@@ -351,6 +351,7 @@ class Mango:
         days = self.datetime.utcnow() - self.timedelta(days=days)
 
         self.websub_callbacks.delete_many({'status': 'retired', 'retired_time': {'$lt': days}})
+        self.websub_callbacks.delete_many({'status': 'requesting', 'requesting_time': {'$lt': days}})
         
         return True
 

ayta/oidc.py

@@ -114,8 +114,10 @@ class OIDC():
                                  algorithms=jwt.algorithms.get_default_algorithms(),
                                  issuer=self.provider,
                                  require=['aud', 'client_id', 'exp', 'iat', 'iss', 'rat', 'sub'],
-                                 audience=self.client_id)
-        except:
+                                 audience=self.client_id,
+                                 leeway=5)
+        except Exception as e:
+            print(e, flush=True)
             return False
 
         # double check if given token is really requested by us

ayta/tasks.py

@@ -10,7 +10,7 @@ def subscribe_websub_callback(channelId):
     
     url = 'https://pubsubhubbub.appspot.com/subscribe'
     data = {
-        'hub.callback': f'https://{current_app.config["DOMAIN"]}/api/websub//{callbackId}',
+        'hub.callback': f'{current_app.config["DOMAIN"]}/api/websub/{callbackId}',
         'hub.topic': f'https://www.youtube.com/xml/feeds/videos.xml?channel_id={channelId}',
         'hub.verify': 'async',
         'hub.mode': 'subscribe',
@@ -32,7 +32,7 @@ def unsubscribe_websub_callback(callbackId, channelId):
     from .nosql import get_nosql
     
     url = 'https://pubsubhubbub.appspot.com/subscribe'
-    data = {'hub.callback': f'https://{current_app.config["DOMAIN"]}/api/websub/{callbackId}',
+    data = {'hub.callback': f'{current_app.config["DOMAIN"]}/api/websub/{callbackId}',
             'hub.topic': f'https://www.youtube.com/xml/feeds/videos.xml?channel_id={channelId}',
             'hub.verify': 'async',
             'hub.mode': 'unsubscribe'

ayta/templates/admin/websub.html

@@ -50,6 +50,7 @@
 	    {% for callback in callbacks %}
         <tr class="filterable">
 		  <td>
+			<a target="_blank" rel="noopener noreferrer" href="https://pubsubhubbub.appspot.com/subscription-details?hub.callback={{ config['DOMAIN'] }}/api/websub/{{ callbacks[callback].get('id') }}&hub.topic=https://www.youtube.com/xml/feeds/videos.xml?channel_id={{ callbacks[callback].get('channel') }}"><button class="btn-small waves-effect waves-light" title="Information on Pubsubhubbub (external link)">ℹ️</button></a>
 		    <form method="post">
 			  <input type="text" value="{{ callbacks[callback].get('id') }}" name="value" hidden>
 		      <button class="btn-small waves-effect waves-light" type="submit" name="task" value="unsubscribe" title="Send unsubscribe request to hub" {% if callbacks[callback].get('status') != 'active' %}disabled{% endif %}>🗑️</button>

requirements.txt

@@ -5,8 +5,7 @@ flask-caching
 flask-limiter
 pymongo
 yt-dlp
-argon2-cffi
 gunicorn
 celery
 sqlalchemy
-pyjwt
+pyjwt[crypto]