glenux-archive/cloutier--bird.makeup
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

clean up

Browse source
This commit is contained in:
Nicolas Constant 2021-02-06 00:13:38 -05:00
parent 130ad6ff63
commit 6d5fe3089e
No known key found for this signature in database
GPG key ID: 1E9F677FB01A5688
1 changed files with 8 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/BirdsiteLive.Domain/UserService.cs
View file

@ -244,29 +244,20 @@ namespace BirdsiteLive.Domain
signature_header.Add(m.Groups[1].ToString(), m.Groups[2].ToString()); signature_header.Add(m.Groups[1].ToString(), m.Groups[2].ToString());
} }
//signature_header["signature"] = signature_header["signature"] + "==";
var key_id = signature_header["keyId"]; var key_id = signature_header["keyId"];
var headers = signature_header["headers"]; var headers = signature_header["headers"];
var algorithm = signature_header["algorithm"]; var algorithm = signature_header["algorithm"];
var sig = Convert.FromBase64String(signature_header["signature"]); var sig = Convert.FromBase64String(signature_header["signature"]);
// Retrieve User
var remoteUser = await _activityPubService.GetUser(actor); var remoteUser = await _activityPubService.GetUser(actor);
// Prepare Key data
var toDecode = remoteUser.publicKey.publicKeyPem.Trim().Remove(0, remoteUser.publicKey.publicKeyPem.IndexOf('\n')); var toDecode = remoteUser.publicKey.publicKeyPem.Trim().Remove(0, remoteUser.publicKey.publicKeyPem.IndexOf('\n'));
toDecode = toDecode.Remove(toDecode.LastIndexOf('\n')).Replace("\n", ""); toDecode = toDecode.Remove(toDecode.LastIndexOf('\n')).Replace("\n", "");
var signKey = ASN1.ToRSA(Convert.FromBase64String(toDecode)); var signKey = ASN1.ToRSA(Convert.FromBase64String(toDecode));
var toSign = new StringBuilder(); var toSign = new StringBuilder();
//var comparisonString = headers.Split(' ').Select(signed_header_name =>
//{
// if (signed_header_name == "(request-target)")
// return "(request-target): post /inbox";
// else
// return $"{signed_header_name}: {r.Headers[signed_header_name.ToUpperInvariant()]}";
//});
foreach (var headerKey in headers.Split(' ')) foreach (var headerKey in headers.Split(' '))
{ {
if (headerKey == "(request-target)") toSign.Append($"(request-target): {method.ToLower()} {path}{queryString}\n"); if (headerKey == "(request-target)") toSign.Append($"(request-target): {method.ToLower()} {path}{queryString}\n");
@ -274,21 +265,13 @@ namespace BirdsiteLive.Domain
} }
toSign.Remove(toSign.Length - 1, 1); toSign.Remove(toSign.Length - 1, 1);
//var signKey = ASN1.ToRSA(Convert.FromBase64String(toDecode)); // Import key
var key = new RSACryptoServiceProvider();
//new RSACryptoServiceProvider(keyId.publicKey.publicKeyPem); var rsaKeyInfo = key.ExportParameters(false);
rsaKeyInfo.Modulus = Convert.FromBase64String(toDecode);
//Create a new instance of RSACryptoServiceProvider. key.ImportParameters(rsaKeyInfo);
RSACryptoServiceProvider key = new RSACryptoServiceProvider();
//Get an instance of RSAParameters from ExportParameters function.
RSAParameters RSAKeyInfo = key.ExportParameters(false);
//Set RSAKeyInfo to the public key values.
RSAKeyInfo.Modulus = Convert.FromBase64String(toDecode);
key.ImportParameters(RSAKeyInfo);
// Trust and Verify
var result = signKey.VerifyData(Encoding.UTF8.GetBytes(toSign.ToString()), sig, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1); var result = signKey.VerifyData(Encoding.UTF8.GetBytes(toSign.ToString()), sig, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
return new SignatureValidationResult() return new SignatureValidationResult()