Fixed Youtube

schneidermanuel · Jan 12, 2025 · 07ddb3d · 07ddb3d
1 parent d0a2504
commit 07ddb3d
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 29 deletions.
diff --git a/DiscordBot.PubSub.Backend/DiscordBotPubSubBackendManager.cs b/DiscordBot.PubSub.Backend/DiscordBotPubSubBackendManager.cs
@@ -55,7 +55,7 @@ public DiscordBotPubSubBackendManager(DiscordSocketClient client,
         IReactionRoleRefresher reactionRoleRefresher,
         IYoutubeRefresher youtubeRefresher,
         ITwitchRefresher twitchRefresher,
-        ITournamentCompletionDomain tournamentCompletionDomain
+    ITournamentCompletionDomain tournamentCompletionDomain
     )
     {
         _client = client;
@@ -457,39 +457,46 @@ private async Task ProcessPost(HttpContext context)
         {
             var checksumHeader = context.Request.Headers["X-Hub-Signature"];
             var signature = checksumHeader.ToString().Split('=')[1];
-            var stream = context.Request.Body;
-            string body;
-            using (var reader = new StreamReader(stream, Encoding.UTF8))
+            using (var stream = new MemoryStream())
             {
-                body = await reader.ReadToEndAsync();
-            }
+                await context.Request.Body.CopyToAsync(stream);
+                stream.Position = 0;
 
-            var isValid = PubSubSecret.Check(body, signature);
+                var isValid = PubSubSecret.Check(stream, signature);
 
-            if (!isValid)
-            {
-                Console.WriteLine("Attention: Invalid signature");
-            }
+                if (!isValid)
+                {
+                    await context.Response.CompleteAsync();
+                    return;
+                }
 
-            await using (var newStream = GenerateStreamFromString(body))
-            {
-                var data = ConvertAtomToSyndication(newStream);
-                if (data != null)
+                string body;
+                stream.Position = 0;
+                using (var reader = new StreamReader(stream))
                 {
-                    if (data.IsNewVideo)
+                    body = await reader.ReadToEndAsync();
+                }
+
+                await using (var newStream = GenerateStreamFromString(body))
+                {
+                    var data = ConvertAtomToSyndication(newStream);
+                    if (data != null)
                     {
-                        _ = _youtubeCallback.Invoke(data);
+                        if (data.IsNewVideo)
+                        {
+                            _ = _youtubeCallback.Invoke(data);
+                        }
+
+                        context.Response.StatusCode = 200;
+                        await context.Response.CompleteAsync();
+                        return;
                     }
-
-                    context.Response.StatusCode = 200;
-                    await context.Response.CompleteAsync();
-                    return;
                 }
-            }
 
 
-            context.Response.StatusCode = 400;
-            await context.Response.CompleteAsync();
+                context.Response.StatusCode = 400;
+                await context.Response.CompleteAsync();
+            }
         }
         catch (Exception e)
         {

diff --git a/DiscordBot.PubSub.Backend/PubSubSecret.cs b/DiscordBot.PubSub.Backend/PubSubSecret.cs
@@ -20,15 +20,16 @@ public static string Secret
         }
     }
 
-    public static bool Check(string body, string signature)
+    public static bool Check(Stream body, string signature)
     {
         using (var hmac = new HMACSHA1(Encoding.UTF8.GetBytes(Secret)))
         {
-            var hashBytes = hmac.ComputeHash(Encoding.UTF8.GetBytes(body));
+            var hashBytes = hmac.ComputeHash(body);
             var hash = BitConverter.ToString(hashBytes).Replace("-", "").ToLower();
             return signature.Equals(hash);
         }
     }
+
     public static bool Check256(string body, string signature)
     {
         using (var hmac = new HMACSHA256(Encoding.UTF8.GetBytes(Secret)))
@@ -38,5 +39,4 @@ public static bool Check256(string body, string signature)
             return signature.Remove(0, 7).Equals(hash);
         }
     }
-
 }
diff --git a/DiscordBot.PubSub/Youtube/YoutubePubSubRegistrator.cs b/DiscordBot.PubSub/Youtube/YoutubePubSubRegistrator.cs
@@ -9,7 +9,7 @@ internal class YoutubePubSubRegistrator : IYoutubePubSubRegistrator
 
     public async Task SubscribeAsync(string channelId)
     {
-        var topic = $"https://www.youtube.com/feeds/videos.xml?channel_id={channelId}";
+        var topic = $"https://www.youtube.com/xml/feeds/videos.xml?channel_id={channelId}";
 
         var client = new HttpClient();
         client.DefaultRequestHeaders.Add("ContentType", "application/x-www-form-urlencoded");
@@ -20,7 +20,8 @@ public async Task SubscribeAsync(string channelId)
                 new("hub.callback", $"https://{BotClientConstants.Hostname}:{BotClientConstants.Port}"),
                 new("hub.topic", topic),
                 new("hub.verify", "async"),
-                new("hub.secret", "hello")
+                new("hub.verify_token", Guid.NewGuid().ToString()),
+                new("hub.secret", PubSubSecret.Secret)
             }));