Merge pull request #86 from kdeng00/deprecate_asymmetric_keys
Deprecating asymmetric keys. Closes #84
This commit was merged in pull request #86.
This commit is contained in:
@@ -29,10 +29,10 @@ namespace Icarus.Controllers.Managers
|
|||||||
#region Fields
|
#region Fields
|
||||||
private string _clientId;
|
private string _clientId;
|
||||||
private string _clientSecret;
|
private string _clientSecret;
|
||||||
private string _privateKeyPath;
|
private string _privateKeyPath = string.Empty;
|
||||||
private string _privateKey;
|
private string _privateKey = string.Empty;
|
||||||
private string _publicKeyPath;
|
private string _publicKeyPath = string.Empty;
|
||||||
private string _publicKey;
|
private string _publicKey = string.Empty;
|
||||||
private string _audience;
|
private string _audience;
|
||||||
private string _grantType;
|
private string _grantType;
|
||||||
private string _url;
|
private string _url;
|
||||||
@@ -88,6 +88,7 @@ namespace Icarus.Controllers.Managers
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
[Obsolete("Asymmetric key signing for tokens have been deprecated")]
|
||||||
public LoginResult LogIn(User user)
|
public LoginResult LogIn(User user)
|
||||||
{
|
{
|
||||||
var tokenResult = new TokenTierOne();
|
var tokenResult = new TokenTierOne();
|
||||||
@@ -152,6 +153,7 @@ namespace Icarus.Controllers.Managers
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Asymmetric key signing for tokens have been deprecated")]
|
||||||
public bool IsTokenValid(string scope, string accessToken)
|
public bool IsTokenValid(string scope, string accessToken)
|
||||||
{
|
{
|
||||||
var result = false;
|
var result = false;
|
||||||
@@ -172,6 +174,7 @@ namespace Icarus.Controllers.Managers
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Asymmetric key signing for tokens have been deprecated")]
|
||||||
public Token DecodeToken(string accessToken)
|
public Token DecodeToken(string accessToken)
|
||||||
{
|
{
|
||||||
var rsaParams = GetRSAPublic(_publicKey);
|
var rsaParams = GetRSAPublic(_publicKey);
|
||||||
@@ -264,6 +267,7 @@ namespace Icarus.Controllers.Managers
|
|||||||
return claim;
|
return claim;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Asymmetric key signing for tokens have been deprecated")]
|
||||||
private string CreateToken(List<Claim> claims, string privateKey)
|
private string CreateToken(List<Claim> claims, string privateKey)
|
||||||
{
|
{
|
||||||
var token = string.Empty;
|
var token = string.Empty;
|
||||||
@@ -323,6 +327,7 @@ namespace Icarus.Controllers.Managers
|
|||||||
return token;
|
return token;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Asymmetric key signing for tokens have been deprecated")]
|
||||||
private RSAParameters GetRSAPublic(string publicKey)
|
private RSAParameters GetRSAPublic(string publicKey)
|
||||||
{
|
{
|
||||||
using (var tr = new System.IO.StringReader(publicKey))
|
using (var tr = new System.IO.StringReader(publicKey))
|
||||||
@@ -362,12 +367,6 @@ namespace Icarus.Controllers.Managers
|
|||||||
_audience = _config["Auth0:ApiIdentifier"];
|
_audience = _config["Auth0:ApiIdentifier"];
|
||||||
_grantType = "client_credentials";
|
_grantType = "client_credentials";
|
||||||
_url = $"https://{_config["Auth0:Domain"]}";
|
_url = $"https://{_config["Auth0:Domain"]}";
|
||||||
_privateKeyPath = _config["RSAKeys:PrivateKeyPath"];
|
|
||||||
_publicKeyPath = _config["RSAKeys:PublicKeyPath"];
|
|
||||||
_privateKey = System.IO.File.ReadAllText(_privateKeyPath);
|
|
||||||
_publicKey = System.IO.File.ReadAllText(_publicKeyPath);
|
|
||||||
|
|
||||||
PrintCredentials();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#region Testing Methods
|
#region Testing Methods
|
||||||
|
|||||||
@@ -53,11 +53,6 @@ namespace Icarus.Controllers.V1
|
|||||||
[HttpGet("{id}")]
|
[HttpGet("{id}")]
|
||||||
public IActionResult GetArtist(int id)
|
public IActionResult GetArtist(int id)
|
||||||
{
|
{
|
||||||
if (!IsTokenValid("read:artists"))
|
|
||||||
{
|
|
||||||
return StatusCode(401, "Not allowed");
|
|
||||||
}
|
|
||||||
|
|
||||||
Artist artist = new Artist
|
Artist artist = new Artist
|
||||||
{
|
{
|
||||||
ArtistID = id
|
ArtistID = id
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ namespace Icarus.Controllers.V1
|
|||||||
|
|
||||||
#region Methods
|
#region Methods
|
||||||
[ApiExplorerSettings(IgnoreApi = true)]
|
[ApiExplorerSettings(IgnoreApi = true)]
|
||||||
|
[Obsolete("Asymmetric key signing for tokens have been deprecated")]
|
||||||
protected string ParseBearerTokenFromHeader()
|
protected string ParseBearerTokenFromHeader()
|
||||||
{
|
{
|
||||||
var token = string.Empty;
|
var token = string.Empty;
|
||||||
@@ -39,6 +40,7 @@ namespace Icarus.Controllers.V1
|
|||||||
}
|
}
|
||||||
|
|
||||||
[ApiExplorerSettings(IgnoreApi = true)]
|
[ApiExplorerSettings(IgnoreApi = true)]
|
||||||
|
[Obsolete("Asymmetric key signing for tokens have been deprecated")]
|
||||||
protected bool IsTokenValid(string scope)
|
protected bool IsTokenValid(string scope)
|
||||||
{
|
{
|
||||||
var token = ParseBearerTokenFromHeader();
|
var token = ParseBearerTokenFromHeader();
|
||||||
|
|||||||
@@ -12,10 +12,6 @@
|
|||||||
"ClientId": "",
|
"ClientId": "",
|
||||||
"ClientSecret": ""
|
"ClientSecret": ""
|
||||||
},
|
},
|
||||||
"RSAKeys": {
|
|
||||||
"PrivateKeyPath": "",
|
|
||||||
"PublicKeyPath": ""
|
|
||||||
},
|
|
||||||
"JWT": {
|
"JWT": {
|
||||||
"Issuer": "",
|
"Issuer": "",
|
||||||
"Audience": "",
|
"Audience": "",
|
||||||
|
|||||||
@@ -12,10 +12,6 @@
|
|||||||
"ClientId": "",
|
"ClientId": "",
|
||||||
"ClientSecret": ""
|
"ClientSecret": ""
|
||||||
},
|
},
|
||||||
"RSAKeys": {
|
|
||||||
"PrivateKeyPath": "",
|
|
||||||
"PublicKeyPath": ""
|
|
||||||
},
|
|
||||||
"JWT": {
|
"JWT": {
|
||||||
"Issuer": "",
|
"Issuer": "",
|
||||||
"Audience": "",
|
"Audience": "",
|
||||||
|
|||||||
Reference in New Issue
Block a user