Austin/BililiveRecorder
1
0
Fork 0
mirror of https://github.com/BililiveRecorder/BililiveRecorder.git synced 2024-11-16 03:32:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Core: Fix redirect did not support relative path

Browse Source
This commit is contained in:
genteure 2022-05-16 21:37:07 +08:00
parent f7be8e9516
commit bc12b720a1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BililiveRecorder.Core/Recording/RecordTaskBase.cs
View File

@ -285,6 +285,7 @@ namespace BililiveRecorder.Core.Recording
{
var allowedAddressFamily = this.room.RoomConfig.NetworkTransportAllowedAddressFamily;
HttpRequestMessage request;
Uri originalUri;
if (this.userScriptRunner.CallOnTransformStreamUrl(this.logger, fullUrl) is { } scriptResult)
{
@ -293,6 +294,7 @@ namespace BililiveRecorder.Core.Recording
this.logger.Debug("用户脚本重定向了直播流地址 {NewUrl}, 旧地址 {OldUrl}", scriptUrl, fullUrl);
fullUrl = scriptUrl;
originalUri = new Uri(fullUrl);
if (scriptIp is not null)
{
@ -312,8 +314,11 @@ namespace BililiveRecorder.Core.Recording
goto sendRequest;
}
}
else
{
originalUri = new Uri(fullUrl);
}
var originalUri = new Uri(fullUrl);
if (allowedAddressFamily == AllowedAddressFamily.System)
{
this.logger.Debug("NetworkTransportAllowedAddressFamily is System");
@ -367,8 +372,8 @@ namespace BililiveRecorder.Core.Recording
case HttpStatusCode.Moved:
case HttpStatusCode.Redirect:
{
fullUrl = resp.Headers.Location.OriginalString;
this.logger.Debug("跳转到 {Url}", fullUrl);
fullUrl = new Uri(originalUri, resp.Headers.Location).ToString();
this.logger.Debug("跳转到 {Url}, 原文本 {Location}", fullUrl, resp.Headers.Location.OriginalString);
resp.Dispose();
break;
}