Update Icarus.csproj

Remove auth

.gitignore

@@ -3,6 +3,9 @@
 ################################################################################
 
 /.vs/Icarus
+/bin/*
 /bin/Debug/netcoreapp2.2
 /Migrations
 /obj
+/obj/*
+/Icarus.txt

Certs/Signing.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Security.Cryptography;
+
+using Microsoft.IdentityModel.Tokens;
+using Org.BouncyCastle.Crypto.Parameters;
+using Org.BouncyCastle.OpenSsl;
+
+
+namespace Icarus.Certs
+{
+    public class SigningIssuerCertificate : IDisposable
+    {
+        private readonly RSACryptoServiceProvider _rsa;
+
+        public SigningIssuerCertificate()
+        {
+            _rsa = new RSACryptoServiceProvider();
+        }
+
+        public RsaSecurityKey GetIssuerSigningKey(string publicKeyPath)
+        {
+            var file = publicKeyPath;
+            var publicKey = System.IO.File.ReadAllText(file);
+
+            using (var reader = System.IO.File.OpenText(file))
+            {
+                var pem = new PemReader(reader);
+                var o = (RsaKeyParameters)pem.ReadObject();
+                var parameters = new RSAParameters();
+                parameters.Modulus = o.Modulus.ToByteArray();
+                parameters.Exponent = o.Exponent.ToByteArray();
+                _rsa.ImportParameters(parameters);
+            }
+
+            return new RsaSecurityKey(_rsa);
+        }
+
+
+        public void Dispose()
+        {
+            _rsa?.Dispose();
+        }
+    }
+
+
+    public class SigningAudienceCertificate : IDisposable
+    {
+        private readonly RSACryptoServiceProvider _rsa;
+
+        public SigningAudienceCertificate()
+        {
+            _rsa = new RSACryptoServiceProvider();
+        }
+
+        public SigningCredentials GetAudienceSigningKey(string keyPath)
+        {
+            var file = keyPath;
+            var publicKey = System.IO.File.ReadAllText(file);
+
+            using (var reader = System.IO.File.OpenText(file))
+            {
+                var pem = new PemReader(reader);
+                var o = (RsaKeyParameters)pem.ReadObject();
+                var parameters = new RSAParameters();
+                parameters.Modulus = o.Modulus.ToByteArray();
+                parameters.Exponent = o.Exponent.ToByteArray();
+                _rsa.ImportParameters(parameters);
+            }
+
+            return new SigningCredentials(
+                key: new RsaSecurityKey(_rsa),
+                algorithm: SecurityAlgorithms.RsaSha256);
+        }
+
+        public void Dispose()
+        {
+            _rsa?.Dispose();
+        }
+    }
+}

Controllers/Managers/SongManager.cs

@@ -180,23 +180,30 @@ namespace Icarus.Controllers.Managers
                 DirectoryManager dirMgr = new DirectoryManager(_config, song);
                 dirMgr.CreateDirectory();
 
-                var filePath = dirMgr.SongDirectory;
-                filePath += $"{song.Filename}";
+                var tempPath = song.SongPath();
+                song.Filename = song.GenerateFilename(1);
+                var filePath = $"{dirMgr.SongDirectory}{song.Filename}";
 
                 _logger.Info($"Absolute song path: {filePath}");
 
 
+                await Task.Run(() =>
+                {
                     using (var fileStream = new FileStream(filePath, FileMode.Create))
                     {
-                    var songBytes = await System.IO.File.ReadAllBytesAsync(song.SongPath());
+                        var songBytes = System.IO.File.ReadAllBytes(tempPath);
 
-                    System.IO.File.WriteAllBytesAsync(filePath, songBytes);
-                    System.IO.File.Delete(song.SongPath());
+                        _logger.Info("Saving song to the filesystem");
+                        fileStream.Write(songBytes, 0, songBytes.Count());
 
-                    song.SongDirectory = dirMgr.SongDirectory;
+                        System.IO.File.Delete(tempPath);
+                        _logger.Info("Deleting temp file");
 
                         _logger.Info("Song successfully saved to filesystem");
                     }
+                });
+
+                song.SongDirectory = dirMgr.SongDirectory;
 
                 var coverMgr = new CoverArtManager(_config);
                 var coverArt = coverMgr.SaveCoverArt(song);
@@ -211,51 +218,74 @@ namespace Icarus.Controllers.Managers
             }
         }
 
-        public async Task SaveSongToFileSystem(IFormFile songFile, IFormFile coverArtData, Song song)
+        public void SaveSongToFileSystem(IFormFile songFile, IFormFile coverArtData, Song song)
         {
+            song.SongDirectory = _tempDirectoryRoot;
+            song.DateCreated = DateTime.Now;
+
             if (string.IsNullOrEmpty(song.Filename))
             {
                 song.Filename = song.GenerateFilename(1);
             }
 
-            song.SongDirectory = _tempDirectoryRoot;
-            song.DateCreated = DateTime.Now;
+            _logger.Info($"Temporary directory: {_tempDirectoryRoot}");
 
-            using (var filestream = new FileStream(song.SongPath(), FileMode.Create))
+            var tempPath = song.SongPath();
+
+            _logger.Info("Temporary song path: {0}", tempPath);
+
+            using (var filestream = new FileStream(tempPath, FileMode.Create))
             {
                 _logger.Info("Saving song to temporary directory");
-                await songFile.CopyToAsync(filestream);
+                songFile.CopyTo(filestream);
             }
 
             var coverMgr = new CoverArtManager(_config);
-            var coverArt = coverMgr.SaveCoverArt(coverArtData, song);
-
             var meta = new MetadataRetriever();
+            var coverArt = coverMgr.SaveCoverArt(coverArtData, song);
+            meta.UpdateCoverArt(song, coverArt);
             song.Duration = meta.RetrieveSongDuration(song.SongPath());
 
             meta.UpdateMetadata(song, song);
-            meta.UpdateCoverArt(song, coverArt);
+
 
             DirectoryManager dirMgr = new DirectoryManager(_config, song);
             dirMgr.CreateDirectory();
 
-            var filePath = dirMgr.SongDirectory + song.Filename;
+            song.SongDirectory = dirMgr.SongDirectory;
 
+            var filePath = song.SongPath();
             _logger.Info($"Absolute song path: {filePath}");
 
-
             using (var fileStream = new FileStream(filePath, FileMode.Create))
             {
-                var songBytes = await System.IO.File.ReadAllBytesAsync(song.SongPath());
+                var songBytes = System.IO.File.ReadAllBytes(tempPath);
 
-                await System.IO.File.WriteAllBytesAsync(filePath, songBytes);
-                System.IO.File.Delete(song.SongPath());
-                song.SongDirectory = dirMgr.SongDirectory;
+                try
+                {
+                    if (System.IO.File.Exists(filePath) && System.IO.File.Exists(tempPath) && fileStream.Length > 0)
+                    {
+                        System.IO.File.Delete(tempPath);
+                        _logger.Info("Deleted temp song from filesystem: {0}", tempPath);
+                    }
+                    else
+                    {
+                        fileStream.Write(songBytes, 0, songBytes.Count());
+                        _logger.Info("Saved song to filesystem: {0}", filePath);
+
+                        System.IO.File.Delete(tempPath);
+                        _logger.Info("Deleted temp song from filesystem: {0}", tempPath);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    var msg = ex.Message;
+                    _logger.Error($"An error occurred: {msg}");
+                }
 
                 _logger.Info("Song successfully saved to filesystem");
             }
 
-
             coverMgr.SaveCoverArtToDatabase(ref song, ref coverArt);
             SaveSongToDatabase(song);
         }
@@ -296,20 +326,23 @@ namespace Icarus.Controllers.Managers
             var song = new Song();
             _logger.Info("Assigning song filename");
             song.SongDirectory = _tempDirectoryRoot;
-            song.Filename = song.GenerateFilename(1);
+            var filename = song.GenerateFilename(1);
+            song.Filename = filename;
 
             using (var filestream = new FileStream(song.SongPath(), FileMode.Create))
             {
-                _logger.Info("Saving song to temporary directory");
+                _logger.Info("Saving temp song: {0}", song.SongPath());
                 await songFile.CopyToAsync(filestream);
             }
-
+            await Task.Run(() =>
+            {
                 MetadataRetriever meta = new MetadataRetriever();
                 song =  meta.RetrieveMetaData(song.SongPath());
+            });
 
             song.SongDirectory = _tempDirectoryRoot;
-            song.Filename = song.GenerateFilename(1);
             song.DateCreated = DateTime.Now;
+            song.Filename = filename;
 
             return song;
         }

Controllers/Managers/TokenManager.cs

@@ -1,20 +1,35 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Claims;
+using System.Security.Cryptography;
+using System.Threading.Tasks;
 
+using JWT;
+using JWT.Serializers;
 using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
+using Org.BouncyCastle.Crypto;
+using Org.BouncyCastle.Crypto.Parameters;
+using Org.BouncyCastle.OpenSsl;
+using Org.BouncyCastle.Security;
+
 using RestSharp;
 
 using Icarus.Models;
 
 namespace Icarus.Controllers.Managers
 {
+    #region Classes
     public class TokenManager : BaseManager
     {
         #region Fields
         private string _clientId;
         private string _clientSecret;
+        private string _privateKeyPath;
+        private string _privateKey;
+        private string _publicKeyPath;
+        private string _publicKey;
         private string _audience;
         private string _grantType;
         private string _url;
@@ -58,7 +73,7 @@ namespace Icarus.Controllers.Managers
 
             _logger.Info("Deserializing response");
             var tokenResult = JsonConvert
-                .DeserializeObject<Token>(response.Content);
+                .DeserializeObject<TokenTierOne>(response.Content);
             _logger.Info("Response deserialized");
 
             return new LoginResult
@@ -69,6 +84,223 @@ namespace Icarus.Controllers.Managers
             };
         }
 
+
+        public LoginResult LogIn(User user)
+        {
+            var tokenResult = new TokenTierOne();
+            tokenResult.TokenType = "Jwt";
+
+            var privateKey = ReadKeyContent(_privateKeyPath).Result;
+            var publicKey = ReadKeyContent(_publicKeyPath).Result;
+
+            var payload = Payload();
+
+            var token = CreateToken(payload, privateKey);
+            tokenResult.AccessToken = token;
+
+            var expClaim = payload.FirstOrDefault(cl =>
+            {
+                return cl.Type.Equals("exp");
+            });
+
+            tokenResult.Expiration = System.Convert.ToInt32(expClaim.Value);
+
+            return new LoginResult
+            {
+                UserID = user.UserID, Username = user.Username, Token = tokenResult.AccessToken,
+                TokenType = tokenResult.TokenType, Expiration = tokenResult.Expiration,
+                Message = "Successfully retrieved token"
+            };
+        }
+
+        public bool IsTokenValid(string scope, string accessToken)
+        {
+            var result = false;
+            var token = DecodeToken(accessToken);
+
+            if (token == null || token.Erroneous())
+            {
+                return result;
+            }
+
+            result = (!token.TokenExpired() && token.ContainsScope(scope)) ? true : false;
+
+            // What would make a token valid?
+            // 1. The expiration date must be before the current date
+            // 2. The desired scope must be part of the scopes within the access token
+            // 3. Must be able to be decoded
+
+            return result;
+        }
+
+        public Token? DecodeToken(string accessToken)
+        {
+            var rsaParams = GetRSAPublic(_publicKey);
+            Token tok = null;
+
+            try
+            {
+                using (var rsa = new RSACryptoServiceProvider())
+                {
+                    rsa.ImportParameters(rsaParams);
+
+                    IJsonSerializer serializer = new JsonNetSerializer();
+                    IDateTimeProvider provider = new UtcDateTimeProvider();
+                    IJwtValidator validator = new JwtValidator(serializer, provider);
+                    IBase64UrlEncoder urlEncoder = new JwtBase64UrlEncoder();
+                    var algorithm = new JWT.Algorithms.RS256Algorithm(rsa);
+                    IJwtDecoder decoder = new JwtDecoder(serializer, validator, urlEncoder, algorithm);
+                    
+                    var json = decoder.Decode(accessToken);
+                    tok = JsonConvert.DeserializeObject<Token>(json);
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.Error("An error occurred: {0}", ex.Message);
+            }
+
+
+            return tok;
+        }
+
+
+        private string AllScopes()
+        {
+            var allScopes = new List<String>()
+            {
+                "download:songs",
+                "read:song_details",
+                "upload:songs",
+                "delete:songs", 
+                "read:albums", 
+                "read:artists",
+                "update:songs", 
+                "stream:songs", 
+                "read:genre", 
+                "read:year", 
+                "download:cover_art"
+            };
+
+            var scopes = string.Empty;
+
+            for (var i = 0; i < allScopes.Count; i++)
+            {
+                if (i == allScopes.Count - 1)
+                {
+                    scopes += allScopes[i];
+                }
+                else
+                {
+                    scopes += allScopes[i] + " ";
+                }
+            }
+
+            return scopes;
+        }
+
+        private List<Claim> Payload()
+        {
+            const int expLimit = 24;
+            var currentDate = DateTime.Now;
+            var expiredDate = currentDate.AddHours(expLimit);
+            var issued = Math.Floor((currentDate - DateTime.UnixEpoch).TotalSeconds);
+            var expires = Math.Floor((expiredDate - DateTime.UnixEpoch).TotalSeconds);
+            var issuer = "https://soaricarus.auth0.com";
+            issuer = "http://localhost:5002";
+            var audience = "https://icarus/api";
+            audience = "http://localhost:5002";
+
+            var claim = new List<System.Security.Claims.Claim>()
+            {
+                new System.Security.Claims.Claim("scope", AllScopes(), "string"),
+                new System.Security.Claims.Claim("exp", $"{expires}", "integer"),
+                new System.Security.Claims.Claim("aud", $"{audience}", "string"),
+                new System.Security.Claims.Claim("iss", $"{issuer}", "string"),
+                new System.Security.Claims.Claim("iat", $"{issued}", "integer")
+            };
+
+            return claim;
+        }
+
+        private string CreateToken(List<Claim> claims, string privateKey)
+        {
+            var token = string.Empty;
+
+            if (string.IsNullOrEmpty(privateKey))
+            {
+                privateKey = ReadKeyContent(_privateKeyPath).Result;
+            }
+
+            RSAParameters rsaParams;
+            using (var tr = new System.IO.StringReader(privateKey))
+            {
+                var pemReader = new PemReader(tr);
+                var keyPair = pemReader.ReadObject() as AsymmetricCipherKeyPair;
+                if (keyPair == null)
+                {
+                    throw new Exception("Could not read RSA private key");
+                } 
+                var privateRsaParams = keyPair.Private as RsaPrivateCrtKeyParameters;
+                rsaParams = DotNetUtilities.ToRSAParameters(privateRsaParams);
+            }
+
+            using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider())
+            {
+                var rsaParamsPublic = GetRSAPublic(ReadKeyContent(_publicKeyPath).Result);
+                var rsaPublic = new RSACryptoServiceProvider();
+
+                rsa.ImportParameters(rsaParams);
+                rsaPublic.ImportParameters(rsaParamsPublic);
+
+                Dictionary<string, object> payload = new Dictionary<string, object>();
+
+                foreach (var claim in claims)
+                {
+                    var type = claim.Type;
+                    var val = Int32.TryParse(claim.Value, out _);
+
+                    if (val)
+                    {
+                        payload.Add(type, Convert.ToInt32(claim.Value));
+                    }
+                    else
+                    {
+                        payload.Add(type, claim.Value);
+                    }
+
+                }
+
+                var algorithm = new JWT.Algorithms.RS256Algorithm(rsaPublic, rsa);
+                IJsonSerializer serializer = new JsonNetSerializer();
+                IBase64UrlEncoder urlEncoder = new JwtBase64UrlEncoder();
+                IJwtEncoder encoder = new JwtEncoder(algorithm, serializer, urlEncoder);
+
+                token = encoder.Encode(payload, privateKey);
+            }
+
+            return token;
+        }
+
+        private RSAParameters GetRSAPublic(string publicKey)
+        {
+            using (var tr = new System.IO.StringReader(publicKey))
+            {
+                var pemReader = new PemReader(tr);
+                var publicKeyParams = pemReader.ReadObject() as RsaKeyParameters;
+                if (publicKeyParams == null)
+                {
+                    throw new Exception("Could not read RSA public key");
+                }
+                return DotNetUtilities.ToRSAParameters(publicKeyParams);
+            }
+        }
+
+        private async Task<string> ReadKeyContent(string filepath)
+        {
+            return await System.IO.File.ReadAllTextAsync(filepath);
+        }
+        
         private TokenRequest RetrieveTokenRequest()
         {
             _logger.Info("Retrieving token object");
@@ -89,6 +321,10 @@ namespace Icarus.Controllers.Managers
             _audience = _config["Auth0:ApiIdentifier"];
             _grantType = "client_credentials";
             _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();
         }
@@ -119,7 +355,7 @@ namespace Icarus.Controllers.Managers
             [JsonProperty("grant_type")]
             public string GrantType { get; set; }
         }
-        private class Token
+        private class TokenTierOne
         {
             [JsonProperty("access_token")]
             public string AccessToken { get; set; }
@@ -130,4 +366,5 @@ namespace Icarus.Controllers.Managers
         }
         #endregion
     }
+    #endregion
 }

Controllers/v1/AlbumController.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Linq;
 
 using Microsoft.AspNetCore.Authorization;
@@ -10,18 +9,16 @@ using Microsoft.Extensions.Logging;
 
 using Icarus.Models;
 using Icarus.Database.Contexts;
-// using Icarus.Database.Repositories;
 
 namespace Icarus.Controllers.V1
 {
     [Route("api/v1/album")]
     [ApiController]
-    public class AlbumController : ControllerBase
+    public class AlbumController : BaseController
     {
         #region Fields
         private readonly ILogger<AlbumController> _logger;
         private string _connectionString;
-        private IConfiguration _config;
         #endregion
 
 
@@ -41,9 +38,13 @@ namespace Icarus.Controllers.V1
 
         #region HTTP Routes
         [HttpGet]
-        [Authorize("read:albums")]
         public IActionResult Get()
         {
+            if (!IsTokenValid("read:albums"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             List<Album> albums = new List<Album>();
 
             var albumContext = new AlbumContext(_connectionString);
@@ -57,9 +58,13 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpGet("{id}")]
-        [Authorize("read:albums")]
         public IActionResult Get(int id)
         {
+            if (!IsTokenValid("read:albums"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             Album album = new Album
             {
                 AlbumID = id

Controllers/v1/ArtistController.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Configuration;
 using System.Linq;
 
 using Microsoft.AspNetCore.Authorization;
@@ -15,12 +13,11 @@ namespace Icarus.Controllers.V1
 {
     [Route("api/v1/artist")]
     [ApiController]
-    public class ArtistController : ControllerBase
+    public class ArtistController : BaseController
     {
         #region Fields
         private readonly ILogger<ArtistController> _logger;
         private string _connectionString;
-        private IConfiguration _config;
         #endregion
 
 
@@ -40,9 +37,13 @@ namespace Icarus.Controllers.V1
 
         #region HTTP Routes
         [HttpGet]
-        [Authorize("read:artists")]
         public IActionResult Get()
         {
+            if (!IsTokenValid("read:artists"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var artistContext = new ArtistContext(_connectionString);
 
             var artists = artistContext.Artists.ToList();
@@ -54,9 +55,13 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpGet("{id}")]
-        [Authorize("read:artists")]
         public IActionResult Get(int id)
         {
+            if (!IsTokenValid("read:artists"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             Artist artist = new Artist
             {
                 ArtistID = id

Controllers/v1/BaseController.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Linq;
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Configuration;
+
+using Icarus.Controllers.Managers;
+
+
+namespace Icarus.Controllers.V1
+{
+    public class BaseController : ControllerBase
+    {
+        #region Fiends
+        protected IConfiguration _config;
+        #endregion
+
+
+        #region Methods
+        protected string ParseBearerTokenFromHeader()
+        {
+            var token = string.Empty;
+            const string tokenType = "Bearer";
+            const string otherTokenType = "Jwt";
+
+            var req = Request;
+            var auth = req.Headers.Authorization; 
+            var val = auth.ToString();
+
+            if ((val.Contains(tokenType) || val.Contains(otherTokenType)) && val.Split(" ").Count() > 1)
+            {
+                var split = val.Split(" ");
+                token = split[1];
+            }
+
+
+            return token;
+        } 
+
+        protected bool IsTokenValid(string scope)
+        {
+            var token = ParseBearerTokenFromHeader();
+            var tokMgr = new TokenManager(_config);
+
+            return tokMgr.IsTokenValid(scope, token);
+        }
+        #endregion
+    }
+}

Controllers/v1/CoverArtController.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -17,12 +15,11 @@ namespace Icarus.Controllers.V1
 {
     [Route("api/v1/coverart")]
     [ApiController]
-    public class CoverArtController : ControllerBase
+    public class CoverArtController : BaseController
     {
         #region Fields
         private readonly ILogger<CoverArtController> _logger;
         private string _connectionString;
-        private IConfiguration _config;
         #endregion
 
 
@@ -39,6 +36,11 @@ namespace Icarus.Controllers.V1
         #region HTTP Routes
         public IActionResult Get()
         {
+            if (!IsTokenValid("read:songs"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var coverArtContext = new CoverArtContext(_connectionString);
 
             var coverArtRecords = coverArtContext.CoverArtImages.ToList();
@@ -56,9 +58,13 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpGet("{id}")]
-        [Authorize("download:cover_art")]
         public async Task<IActionResult> Get(int id)
         {
+            if (!IsTokenValid("download:cover_art"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var coverArt = new CoverArt { CoverArtID = id };
 
             var coverArtContext = new CoverArtContext(_connectionString);

Controllers/v1/GenreController.cs

@@ -14,12 +14,11 @@ namespace Icarus.Controllers.V1
 {
     [Route("api/v1/genre")]
     [ApiController]
-    public class GenreController : ControllerBase
+    public class GenreController : BaseController
     {
         #region Fields
         private readonly ILogger<GenreController> _logger;
         private string _connectionString;
-        private IConfiguration _config;
         #endregion
 
 
@@ -39,9 +38,13 @@ namespace Icarus.Controllers.V1
 
         #region HTTP Routes
         [HttpGet]
-        [Authorize("read:genre")]
         public IActionResult Get()
         {
+            if (!IsTokenValid("read:genre"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var genres = new List<Genre>();
 
             var genreStore = new GenreContext(_connectionString);
@@ -55,9 +58,13 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpGet("{id}")]
-        [Authorize("read:genre")]
         public IActionResult Get(int id)
         {
+            if (!IsTokenValid("read:genre"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var genre = new Genre
             {
                 GenreID = id

Controllers/v1/LoginController.cs

@@ -73,7 +73,7 @@ namespace Icarus.Controllers.V1
 
                 TokenManager tk = new TokenManager(_config);
 
-                loginRes = tk.RetrieveLoginResult(user);
+                loginRes = tk.LogIn(user);
 
                 return Ok(loginRes);
             }

Controllers/v1/SongCompressedDataControllers.cs

@@ -19,11 +19,10 @@ namespace Icarus.Controllers.V1
 {
     [Route("api/v1/song/compressed/data")]
     [ApiController]
-    public class SongCompressedDataController : ControllerBase
+    public class SongCompressedDataController : BaseController
     {
         #region Fields
         private string _connectionString;
-        private IConfiguration _config;
         private string _songTempDir;
         private string _archiveDir;
         #endregion
@@ -46,9 +45,13 @@ namespace Icarus.Controllers.V1
 
         #region API Routes
         [HttpGet("{id}")]
-        [Authorize("download:songs")]
         public async Task<IActionResult> Get(int id)
         {
+            if (!IsTokenValid("download:songs"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var context = new SongContext(_connectionString);
 
             SongCompression cmp = new SongCompression(_archiveDir);

Controllers/v1/SongController.cs

@@ -18,12 +18,11 @@ namespace Icarus.Controllers.V1
 {
     [Route("api/v1/song")]
     [ApiController]
-    public class SongController : ControllerBase
+    public class SongController : BaseController
     {
         #region Fields
         private readonly ILogger<SongController> _logger;
         private string _connectionString;
-        private IConfiguration _config;
         private SongManager _songMgr;
         #endregion
 
@@ -43,10 +42,18 @@ namespace Icarus.Controllers.V1
         #endregion
 
 
+        #region Methods
+        #region HTTP Endpoints
+
+
         [HttpGet]
-        [Authorize("read:song_details")]
         public IActionResult Get()
         {
+            if (!IsTokenValid("read:song_details"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             List<Song> songs = new List<Song>();
             Console.WriteLine("Attemtping to retrieve songs");
             _logger.LogInformation("Attempting to retrieve songs");
@@ -62,9 +69,13 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpGet("{id}")]
-        [Authorize("read:song_details")]
         public IActionResult Get(int id)
         {
+            if (!IsTokenValid("read:song_details"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var context = new SongContext(_connectionString);
             
             Song song = new Song { SongID = id };
@@ -78,10 +89,14 @@ namespace Icarus.Controllers.V1
                 return NotFound();
         }
 
-        [Authorize("update:songs")]
         [HttpPut("{id}")]
         public IActionResult Put(int id, [FromBody] Song song)
         {
+            if (!IsTokenValid("update:songs"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var context = new SongContext(_connectionString);
 
             song.SongID = id;
@@ -100,5 +115,7 @@ namespace Icarus.Controllers.V1
 
             return Ok(songRes);
         }
+        #endregion
+        #endregion
     }
 }

Controllers/v1/SongDataController.cs

@@ -20,11 +20,10 @@ namespace Icarus.Controllers.V1
 {
     [Route("api/v1/song/data")]
     [ApiController]
-    public class SongDataController : ControllerBase
+    public class SongDataController : BaseController
     {
         #region Fields
         private string _connectionString;
-        private IConfiguration _config;
         private ILogger<SongDataController> _logger;
         private SongManager _songMgr;
         private string _songTempDir;
@@ -47,12 +46,15 @@ namespace Icarus.Controllers.V1
         #endregion
 
 
-
         [HttpGet("download/{id}")]
         [Route("private-scoped")]
-        [Authorize("download:songs")]
         public async Task<IActionResult> Get(int id)
         {
+            if (!IsTokenValid("download:songs"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var songContext = new SongContext(_connectionString);
             var songMetaData = songContext.RetrieveRecord(new Song { SongID = id});
             
@@ -75,24 +77,29 @@ namespace Icarus.Controllers.V1
         //
         [HttpPost("upload"), DisableRequestSizeLimit]
         [Route("private-scoped")]
-        [Authorize("upload:songs")]
-        public async Task<IActionResult> Post([FromForm(Name = "file")] List<IFormFile> songData)
+        public IActionResult Post([FromForm(Name = "file")] List<IFormFile> songData)
         {
+            if (!IsTokenValid("upload:songs"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             try
             {
-                Console.WriteLine("Uploading song...");
+                // Console.WriteLine("Uploading song...");
                 _logger.LogInformation("Uploading song...");
 
                 var uploads = _songTempDir;
-                Console.WriteLine($"Song Root Path {uploads}");
+                // Console.WriteLine($"Song Root Path {uploads}");
                 _logger.LogInformation($"Song root path {uploads}");
 
                 foreach (var sng in songData)
-                    if (sng.Length > 0) {
-                        Console.WriteLine($"Song filename {sng.FileName}");
+                    if (sng.Length > 0)
+                    {
+                        // Console.WriteLine($"Song filename {sng.FileName}");
                         _logger.LogInformation($"Song filename {sng.FileName}");
 
-                        await _songMgr.SaveSongToFileSystem(sng);
+                        _songMgr.SaveSongToFileSystem(sng).Wait();
                     }
 
                 return Ok();
@@ -112,9 +119,13 @@ namespace Icarus.Controllers.V1
         //
         [HttpPost("upload/with/data")]
         [Route("private-scoped")]
-        [Authorize("upload:songs")]
-        public async Task<IActionResult> Post ([FromForm] UploadSongWithDataForm up)
+        public IActionResult Post ([FromForm] UploadSongWithDataForm up)
         {
+            if (!IsTokenValid("upload:songs"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             try
             {
                 if (up.SongData.Length > 0 && up.CoverArtData.Length > 0 && !string.IsNullOrEmpty(up.SongFile))
@@ -122,7 +133,7 @@ namespace Icarus.Controllers.V1
                     var song = Newtonsoft.Json.JsonConvert.DeserializeObject<Song>(up.SongFile);
                     _logger.LogInformation($"Song title: {song.Title}");
 
-                    await _songMgr.SaveSongToFileSystem(up.SongData, up.CoverArtData, song);
+                    _songMgr.SaveSongToFileSystem(up.SongData, up.CoverArtData, song);
                 }
             }
             catch (Exception ex)
@@ -134,9 +145,13 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpDelete("delete/{id}")]
-        [Authorize("delete:songs")]
         public IActionResult Delete(int id)
         {
+            if (!IsTokenValid("delete:songs"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var songContext = new SongContext(_connectionString);
 
             var songMetaData = new Song{ SongID = id };

Controllers/v1/SongStreamController.cs

@@ -13,18 +13,18 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
 using Icarus.Models;
+using Icarus.Controllers.Managers;
 using Icarus.Database.Contexts;
 
 namespace Icarus.Controllers.V1
 {
     [Route("api/v1/song/stream")]
     [ApiController]
-    public class SongStreamController : ControllerBase
+    public class SongStreamController : BaseController
     {
         #region Fields
         private ILogger<SongStreamController> _logger;
         private string _connectionString;
-        private IConfiguration _config;
         #endregion
 
 
@@ -44,9 +44,13 @@ namespace Icarus.Controllers.V1
 
         #region HTTP endpoints
         [HttpGet("{id}")]
-        [Authorize("stream:songs")]
         public async Task<IActionResult> Get(int id)
         {
+            if (!IsTokenValid("stream:songs"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var context = new SongContext(_config.GetConnectionString("DefaultConnection"));
 
             var song = context.Songs.FirstOrDefault(sng => sng.SongID == id);

Database/Contexts/UserContext.cs

@@ -8,6 +8,7 @@ using System.Linq;
 // using MySql.Data.Entity;
 // using MySql.Data.MySqlClient;    
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
 
 using Icarus.Models;
         
@@ -18,11 +19,15 @@ namespace Icarus.Database.Contexts
         public DbSet<User> Users { get; set; }
 
 
+        #region Constructors
         public UserContext(DbContextOptions<UserContext> options) : base(options) { }
+        [ActivatorUtilitiesConstructor]
         public UserContext(string connString) : base(new DbContextOptionsBuilder<UserContext>()
                             .UseMySQL(connString).Options)
         {
         }                        
+        #endregion
+
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {

Icarus.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-    <Version>0.1.9</Version>
+    <Version>0.1.10</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,6 +11,7 @@
     <PackageReference Include="DotNetZip" Version="1.15.0" />
     <PackageReference Include="EntityFramework" Version="6.4.4" />
     <PackageReference Include="ID3" Version="0.6.0" />
+    <PackageReference Include="JWT" Version="9.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.8" />
@@ -21,6 +22,7 @@
     <PackageReference Include="MySql.EntityFrameworkCore" Version="5.0.8" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
+    <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
     <PackageReference Include="RestSharp" Version="106.15.0" />
     <PackageReference Include="SevenZip" Version="19.0.0" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.15.0" />

Icarus.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32616.157
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Icarus", "Icarus.csproj", "{66389DAC-0D3C-4271-BBAE-AF27FCFD28B7}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{66389DAC-0D3C-4271-BBAE-AF27FCFD28B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66389DAC-0D3C-4271-BBAE-AF27FCFD28B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66389DAC-0D3C-4271-BBAE-AF27FCFD28B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66389DAC-0D3C-4271-BBAE-AF27FCFD28B7}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {0BE61157-7A0C-41CF-B097-71178A3F6755}
+	EndGlobalSection
+EndGlobal

Models/Song.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using System.Threading.Tasks;
 
 using Newtonsoft.Json;
 
@@ -79,6 +80,21 @@ namespace Icarus.Models
                 s[random.Next(s.Length)]).ToArray());
             var extension = ".mp3";
 
+            return flag == 0 ? filename : $"{filename}{extension}";
+        }
+        public async Task<string> GenerateFilenameAsync(int flag = 0)
+        {
+            const int length = 25;
+            const string chars = "ABCDEF0123456789";
+            var extension = ".mp3";
+            var random = new Random();
+            var filename = await Task.Run(() =>
+            {
+                return new string(Enumerable.Repeat(chars, length).Select(s =>
+                    s[random.Next(s.Length)]).ToArray());
+            });
+            
+
             return flag == 0 ? filename : $"{filename}{extension}";
         }
         #endregion

Models/Token.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Linq;
+
+using Newtonsoft.Json;
+
+
+namespace Icarus.Models
+{
+    public class Token
+    {
+        #region Properties
+        [JsonProperty("scope")]
+        public string Scope { get; set; }
+        [JsonProperty("exp")]
+        public int Expiration { get; set; }
+        [JsonProperty("aud")]
+        public string Audience { get; set; }
+        [JsonProperty("iss")]
+        public string Issuer { get; set; }
+        [JsonProperty("iat")]
+        public int Issued { get; set; }
+        #endregion
+    
+        #region Methods
+        public bool TokenExpired()
+        {
+            var result = false;
+            var currentDate = DateTime.Now;
+
+            var currentDateInSeconds = Math.Floor((currentDate - DateTime.UnixEpoch).TotalSeconds);
+
+            result = (currentDateInSeconds >= Expiration) ? true : false;
+
+            return result;
+        }
+
+        public bool ContainsScope(string desiredScope)
+        {
+            var result = false;
+            result = Scope.Contains(desiredScope);
+
+            return result;
+        }
+
+        public bool Erroneous()
+        {
+            var result = true;
+            Func<string, bool> isEmpty = a => string.IsNullOrEmpty(a);
+            result = (!isEmpty(Scope) && !isEmpty(Audience) && !isEmpty(Issuer) &&
+                Expiration > 0 && Issued > 0) ? false : true;
+
+            return result;
+        }
+        #endregion
+    }
+}

Models/User.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
 
 using Newtonsoft.Json;
 
@@ -9,6 +10,7 @@ namespace Icarus.Models
     [Table("User")]
     public class User
     {
+        #region Properties
         [JsonProperty("user_id")]
         [Column("UserID")]
         [Key]
@@ -35,5 +37,21 @@ namespace Icarus.Models
         public string Status { get; set; }
         [JsonProperty("last_login")]
         public DateTime? LastLogin { get; set; }
+
+        [JsonIgnore]
+        [NotMapped]
+        public System.Collections.Generic.IEnumerable<string> Roles { get; set; }
+        #endregion
+
+
+        #region Methods
+        public System.Collections.Generic.IEnumerable<System.Security.Claims.Claim> Claims()
+        {
+            var claims = new System.Collections.Generic.List<System.Security.Claims.Claim> { new System.Security.Claims.Claim(System.Security.Claims.ClaimTypes.Name, Username) };
+            claims.AddRange(Roles.Select(role => new System.Security.Claims.Claim(System.Security.Claims.ClaimTypes.Role, role)));
+
+            return claims;
+        }
+        #endregion
     }
 }

README.md

@@ -10,74 +10,66 @@ One can interface with Icarus the music server either by:
 * [IcarusDownloadManager](https://github.com/amazing-username/IcarusDownloadManager)
 
 
-
 ## Built With
 
-
 * C# [.NET](https://dotnet.microsoft.com/) 6
 * [MySql](https://www.nuget.org/packages/MySql.Data/)
+* OpenSSL
+* BCrypt.Net-Next
+* DotNetZip
+* ID3
+* JWT
+* Microsoft.AspNetCore.Authentication.JwtBearer
+* Microsoft.AspNetCore.Mvc.NewtonsoftJson
+* Microsoft.EntityFrameworkCore
+* Microsoft.EntityFrameworkCore.Tools
+* MySql.EntityFrameworkCore
 * [Newtonsoft.Json](https://www.newtonsoft.com/json)
+* NLog.Web.AspNetCpre
+* Portable.BouncyCastle
+* RestSharp
+* SevenZip
+* System.IdentityModel.Tokens.Jwt
 * [TagLib#](https://github.com/mono/taglib-sharp)
 
-![image](https://user-images.githubusercontent.com/14333136/56252069-28532d00-6084-11e9-896d-1a3c378014ef.png)
+
 
 ## Getting started
+
 There are several things that need to be completed to properly setup and secure the API.
-1. Auth0 API configuration
+1. Creating RSA keys
 2. API filesystem paths
 3. Database connection string
 4. Migrations
 
-### Auth0 API configuration
 
-Securing Icarus is required, preventing the API from being publicly accessible. To do so, create an Auth0 account (it's free), for the sake of this section of the documentation, I will not go over how to create an Auth0 account. Once created, create a tentant and proceed to create an API
-<h1 align=center>
-    <img src="Images/Configuration/create_api.png" width=100%>
-</h1>
+### Creating RSA keys
 
-Create the API and enter an approrpiate name and identified. For the identified, append **api** like in the example
-<h1 align="center">
-    <img src="Images/Configuration/enter_api_info.png" width=100%>
-</h1>
-Replace [domain] with the domain name of the created tenant. This can be found in the Default App from the Application menu. Replace [identifier] with the identifer root name in the appsettings environment file. Not the friendly name but the root name of the identifier, omitting the http protocol and the *api* path.
-
-```Json
-  "Auth0": {
-	  "Domain": "[domain].auth0.com", 
-	  "ApiIdentifier": "https://[identifier]/api"
-  },
+1. Create private key
+```
+openssl genrsa -out private.pem 2048
+```
+2. Create public key
+```
+openssl rsa -in private -pubout -out public.pem
 ```
 
-For the sake of this section, I will not go over configuring the API to accept the signing algorithm since it has already been configured in the [Startip](Startup.cs).cs file. Click on permissions to create the permissions for the API.
-<h1 align "center">
-    <img src="Images/Configuration/configure_api.png" width=100%>
-</h1>
+Configure the key paths in the config files
 
-The permissions ensure that a validated user can interact with the API with a token that has not expired. Ensure that the permissions match, the description can change but the permission identifier must match.
-<h1 align="center">
-    <img src="Images/Configuration/permissions.png" width=100%>
-</h1>
-
-On the left side, click on Application and create a new Application. Choose the Machine to Machine Application
-<h1 align="center">
-    <img src="Images/Configuration/create_m2m.png" width=100%>
-</h1>
-
-With the grant permissions you created from the API, enable all the permissions. This is important because if they are not enabled then even with a valid token the request will return 403 (unauthorized)
-<h1 align="center">
-    <img src="Images/Configuration/authorize_app.png" width=100%>
-</h1>
-
-From the Application page, copy the client id and client secret. These values will be used for the API to interact with API.
-<h1 align="center">
-    <img src="Images/Configuration/api_cred.png" width=100%>
-</h1>
-Enter the information in the corresponding appsettings json file
 ```Json
-  "Auth0": {
-	  "ClientId":"",
-	  "ClientSecret":""
-  },
+"RSAKeys": {
+  "PrivateKeyPath": "",
+  "PublicKeyPath": ""
+}
+```
+
+Replace [domain] with the domain name that represent's your domain. Replace [identifier] with the identifer root name in the appsettings environment file. Not the friendly name but the root name of the identifier, omitting the http protocol and the *api* path.
+
+```Json
+"Auth0": {
+  "Domain": "[domain].auth0.com", 
+  "ApiIdentifier": "https://[identifier]/api"
+},
 ```
 
 ### API filesystem paths
@@ -87,12 +79,14 @@ For the purposes of properly uploading, downloading, updating, deleting, and str
 {
   "RootMusicPath": "/home/dev/null/music/",
   "TemporaryMusicPath": "/home/dev/null/music/temp/",
-  "ArchivePath": "/home/dev/null/music/archive/"
+  "ArchivePath": "/home/dev/null/music/archive/",
+  "CoverArtPath": "/home/dev/null/music/coverart/"
 }
 ```
 * RootMusicPath - Where music will be stored in the following convention: *`Artist/Album/Songs`*
 * TemporaryMusicPath - Where music will be stored when uploding songs to the server until the metadata has been fully parsed and entered into the database. Upon completion the files will be deleted and moved to the appropriate path in the `RootMusicPath`
 * ArchivePath - When downloading compressed songs this is the path where songs will be compressed prior to dataa being read into memory, deleting the compressed file, and sending the compressed file from memory to the client
+* CoverArtPath - Root directory where cover art will be saved to
 
 
 **Note**: The `TemporaryMusic` or `ArchivePath` does not have to be located in the `RootMusicPath`. Ensure that the permissions are properly set for all of the paths.
@@ -100,15 +94,15 @@ For the purposes of properly uploading, downloading, updating, deleting, and str
 ### Database connection string
 
 In order for Database functionality to be operable, there must be a valid connection string and credentials with appropriate permissions. **At the moment there is only support for MySQL**. Depending on your environment `Release` or `Debug` you will need to edit the appsettings.json or appsettings.Development.json accordingly. An example of the fields to change are below:
+
 ```Json
 {
-
   "ConnectionStrings": {
     "DefaultConnection": "Server=localhost;Database=my_db;Uid=admin;Pwd=toughpassword;"
   }
- 
 }
 ```
+
 * Server - The address or domain name of the MySQL server
 * Database - The database name
 * Uid - Username
@@ -146,13 +140,9 @@ From this point the database has been successfully configured. Metadata and song
 
 Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on the code of conduct, and the process for submitting pull requests to the project.
 
-## Versioning
-
-* [v0.1](https://github.com/amazing-username/Icarus/releases/tag/v0.1)
-
 ## Authors
 
-* **Kun Deng** - [amazing-username](https://github.com/amazing-username)
+* [kdeng00](https://github.com/kdeng00)
 
 See also the list of [contributors](https://github.com/amazing-username/Icarus/graphs/contributors) who participated in this project.
 

Startup.cs

@@ -1,16 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.IdentityModel.Tokens.Jwt;
-using System.Security.Claims;
 
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.HttpsPolicy;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -22,21 +13,54 @@ using NLog;
 using NLog.Web;
 using NLog.Web.AspNetCore;
 
-using Icarus.Authorization;
-using Icarus.Authorization.Handlers;
 using Icarus.Database.Contexts;
 
 namespace Icarus
 {
+    public static class ServiceStartup
+    {
+        public static IServiceCollection AddAsymmetricAuthentication(this IServiceCollection services, IConfiguration configuration)
+        {
+            var issuerSigningCertificate = new Icarus.Certs.SigningIssuerCertificate();
+            RsaSecurityKey issuerSigningKey = issuerSigningCertificate.GetIssuerSigningKey(configuration["RSAKeys:PublicKeyPath"]);
+
+            services.AddAuthentication(authOptions =>
+                {
+                })
+                .AddJwtBearer(options =>
+                {
+                    options.TokenValidationParameters = new TokenValidationParameters
+                    {
+                        IssuerSigningKey = issuerSigningKey,
+                    };
+                });
+
+            return services;
+        }
+
+        private static bool LifetimeValidator(DateTime? notBefore,
+            DateTime? expires,
+            SecurityToken securityToken,
+            TokenValidationParameters validationParameters)
+        {
+            return expires != null && expires > DateTime.UtcNow;
+        }
+    }
     public class Startup
     {
+        #region Constructors
         public Startup(IConfiguration configuration)
         {
             Configuration = configuration;
         }
+        #endregion
 
+        #region Properties
         public IConfiguration Configuration { get; }
+        #endregion
 
+
+        #region Methods
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
@@ -46,67 +70,8 @@ namespace Icarus
             var domain = $"https://{auth_id}/";
             var audience = Configuration["Auth0:ApiIdentifier"];
 
-            services
-                .AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
-                .AddJwtBearer(options => 
-                {
-                    options.Authority = domain;
-                    options.Audience = audience;
-                });
-
-            services.AddAuthorization(options =>
-            {
-                options.AddPolicy("download:songs", policy => 
-                policy.Requirements
-                .Add(new HasScopeRequirement("download:songs", domain)));
-
-                options.AddPolicy("download:cover_art", policy =>
-                    policy.Requirements
-                    .Add(new HasScopeRequirement("download:cover_art", domain)));
-
-                options.AddPolicy("upload:songs", policy => 
-                    policy.Requirements
-                    .Add(new HasScopeRequirement("upload:songs", domain)));
-
-                options.AddPolicy("delete:songs", policy =>
-                    policy.Requirements
-                    .Add(new HasScopeRequirement("delete:songs", domain)));
-
-                options.AddPolicy("read:song_details", policy => 
-                    policy.Requirements
-                    .Add(new HasScopeRequirement("read:song_details", domain)));
-
-                options.AddPolicy("update:songs", policy =>
-                    policy.Requirements
-                    .Add(new HasScopeRequirement("update:songs", domain)));
-
-                options.AddPolicy("read:artists", policy =>
-                    policy.Requirements
-                    .Add(new HasScopeRequirement("read:artists", domain)));
-
-                options.AddPolicy("read:albums", policy =>
-                    policy.Requirements
-                    .Add(new HasScopeRequirement("read:albums", domain)));
-
-                options.AddPolicy("read:genre", policy =>
-                    policy.Requirements
-                    .Add(new HasScopeRequirement("read:genre", domain)));
-
-                options.AddPolicy("read:year", policy =>
-                    policy.Requirements
-                    .Add(new HasScopeRequirement("read:year", domain)));
-
-                options.AddPolicy("stream:songs", policy =>
-                    policy.Requirements
-                    .Add(new HasScopeRequirement("stream:songs", domain)));
-            });
-
-
-            services.AddSingleton<IAuthorizationHandler, HasScopeHandler>();
-
             var connString = Configuration.GetConnectionString("DefaultConnection");
 
-
             services.AddDbContext<SongContext>(options => options.UseMySQL(connString));
             services.AddDbContext<AlbumContext>(options => options.UseMySQL(connString));
             services.AddDbContext<ArtistContext>(options => options.UseMySQL(connString));
@@ -114,6 +79,16 @@ namespace Icarus
             services.AddDbContext<GenreContext>(options => options.UseMySQL(connString));
             services.AddDbContext<CoverArtContext>(options => options.UseMySQL(connString));
 
+            services.AddAsymmetricAuthentication(Configuration);
+
+            /**
+            services.AddTransient<AuthenticationService>(au => new AuthenticationService(new UserService(Configuration), new TokenService(Configuration), Configuration));
+            services.AddTransient<UserService>(us => new UserService(Configuration));
+            services.AddTransient<TokenService>(tk => new TokenService(Configuration));
+            services.AddTransient<UserRepository>();
+            services.AddTransient<UserContext>(uc => new UserContext(connString));
+            */
+
             services.AddControllers()
                 .AddNewtonsoftJson();
         }
@@ -131,5 +106,6 @@ namespace Icarus
                 endpoints.MapControllers();
             });
         }
+        #endregion
     }
 }

appsettings.Development.json

@@ -12,6 +12,10 @@
 	  "ClientId": "",
 	  "ClientSecret": ""
   },
+  "RSAKeys": {
+    "PrivateKeyPath": "",
+    "PublicKeyPath": ""
+  },
   "ConnectionStrings": {
 	  "DefaultConnection": "Server=;Database=;Uid=;Pwd=;"
   },

appsettings.json

@@ -12,6 +12,10 @@
 	  "ClientId": "",
 	  "ClientSecret": ""
   },
+  "RSAKeys": {
+    "PrivateKeyPath": "",
+    "PublicKeyPath": ""
+  },
   "ConnectionStrings": {
 	  "DefaultConnection": "Server=;Database=;Uid=;Pwd=;"
   },