liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: don't show discord URL tokens in logs

Browse Source
This commit is contained in:
spiral 2021-11-02 05:44:47 -04:00
parent b430446171
commit 08c5b78cc2
No known key found for this signature in database
GPG Key ID: A6059F0CA0E1BD31
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Myriad/Rest/BaseRestClient.cs
View File

@ -179,7 +179,7 @@ namespace Myriad.Rest
var request = createRequest(); var request = createRequest();
_logger.Debug("Request: {RequestMethod} {RequestPath}", _logger.Debug("Request: {RequestMethod} {RequestPath}",
request.Method, request.RequestUri?.ToString().Substring(_baseUrl.Length)); request.Method, CleanForLogging(request.RequestUri!));
request.Version = _httpVersion; request.Version = _httpVersion;
request.VersionPolicy = HttpVersionPolicy.RequestVersionOrHigher; request.VersionPolicy = HttpVersionPolicy.RequestVersionOrHigher;
@ -204,7 +204,7 @@ namespace Myriad.Rest
_logger.Debug( _logger.Debug(
"Response: {RequestMethod} {RequestPath} -> {StatusCode} {ReasonPhrase} (in {ResponseDurationMs} ms)", "Response: {RequestMethod} {RequestPath} -> {StatusCode} {ReasonPhrase} (in {ResponseDurationMs} ms)",
request.Method, request.RequestUri?.ToString().Substring(_baseUrl.Length), (int)response.StatusCode, request.Method, CleanForLogging(request.RequestUri!), (int)response.StatusCode,
response.ReasonPhrase, stopwatch.ElapsedMilliseconds); response.ReasonPhrase, stopwatch.ElapsedMilliseconds);
await HandleApiError(response, ignoreNotFound); await HandleApiError(response, ignoreNotFound);
@ -305,5 +305,20 @@ namespace Myriad.Rest
var routePath = NormalizeRoutePath(localPath); var routePath = NormalizeRoutePath(localPath);
return $"{req.Method} {routePath}"; return $"{req.Method} {routePath}";
} }
private string CleanForLogging(Uri uri)
{
var path = uri.ToString();
// don't show tokens in logs
// todo: anything missing here?
path = Regex.Replace(path, @"/webhooks/(\d+)/[^/]+", "/webhooks/$1/:token");
path = Regex.Replace(path, @"/interactions/(\d+)/[^{/]+", "/interactions/$1/:token");
// remove base URL
path = path.Substring(_baseUrl.Length);
return path;
}
} }
} }