diff --git a/Step.Config/Constants.cs b/Step.Config/Constants.cs
index aa9aaa0c..988ad3e8 100644
--- a/Step.Config/Constants.cs
+++ b/Step.Config/Constants.cs
@@ -9,8 +9,25 @@ namespace Step.Config
WRITE
}
- public static string ROLE_LEVEL_KEY = "roleLevel";
- public static string USERNAME_KEY = "username";
- public static string ID_KEY = "id";
+ // Token fields Keys
+ public const string ROLE_LEVEL_KEY = "roleLevel";
+ public const string USERNAME_KEY = "username";
+ public const string ID_KEY = "id";
+
+ // Names in the xml file
+ public const string SERVER_CONFIG_KEY = "serverConfig";
+ public const string NC_CONFIG_KEY = "ncConfig";
+ public const string AREAS_CONFIG_KEY = "areasConfig";
+
+ public static class AREAS
+ {
+ public const string PRODUCTION_KEY = "production";
+ public const string TOOLING_KEY = "tooling";
+ public const string REPORT_KEY = "report";
+ public const string ALARMS_KEY = "alarms";
+ public const string MAINTENANCE_KEY = "maintenance";
+ public const string UTILITIES_KEY = "utilities";
+ public const string SCADA_KEY = "scada";
+ }
}
}
diff --git a/Step.Config/StartupConfig.cs b/Step.Config/StartupConfig.cs
index f563e698..b72e50a2 100644
--- a/Step.Config/StartupConfig.cs
+++ b/Step.Config/StartupConfig.cs
@@ -9,7 +9,8 @@ namespace Step.Config
{
public static class StartupConfig
{
- public static GenericConfigModel genericConfig;
+ public static ServerConfigModel serverConfig;
+ public static NcConfigModel ncConfig;
public static AreasConfigModel productionConfig;
public static AreasConfigModel toolingConfig;
diff --git a/Step.Config/StartupConfigController.cs b/Step.Config/StartupConfigController.cs
index eddb3c9b..8979e0a3 100644
--- a/Step.Config/StartupConfigController.cs
+++ b/Step.Config/StartupConfigController.cs
@@ -6,13 +6,14 @@ using System.Xml.Linq;
using System.Linq;
using static Step.Config.StartupConfig;
using Step.Model.ConfigModels;
+using static Step.Config.Constants;
namespace Step.Config
{
- public class StartupConfigController
+ public static class StartupConfigController
+ {
+ public static void ReadStartupConfig()
{
- public static void ReadStartUpConfig()
- {
// Read validation file
XmlSchemaSet readerSettings = new XmlSchemaSet();
// Add Schema
@@ -22,60 +23,71 @@ namespace Step.Config
// Validate file
xmlConfigFile.Validate(readerSettings, ValidationHandler);
- // Read generic config with LINQ
- genericConfig = xmlConfigFile
- .Descendants("generalConfig")
- .Select(x => new GenericConfigModel()
+ // Read nc Config with LINQ
+ ncConfig = xmlConfigFile
+ .Descendants(NC_CONFIG_KEY)
+ .Select(x => new NcConfigModel()
{
- Language = x.Element("language").Value,
- ServerPort = Convert.ToInt32(x.Element("serverPort").Value),
- NcVendor = Convert.ToInt32(x.Element("NcVendor").Value),
- NcIpAddress = x.Element("NcIpAddress").Value,
- NcPort = Convert.ToInt32(x.Element("NcPort").Value)
+ NcVendor = Convert.ToInt32(x.Element("ncVendor").Value),
+ NcIpAddress = x.Element("ncIpAddress").Value,
+ NcPort = Convert.ToInt32(x.Element("ncPort").Value)
}).FirstOrDefault();
+ // Read server config with LINQ and save into static config
+ serverConfig = xmlConfigFile
+ .Descendants(SERVER_CONFIG_KEY)
+ .Select(x => new ServerConfigModel()
+ { // Set server config model data
+ Language = x.Element("language").Value,
+ ServerPort = Convert.ToInt32(x.Element("serverPort").Value),
+ EnableDirectoryBrowsing = Convert.ToBoolean(x.Element("enableDirectoryBrowsing").Value)
+ }).FirstOrDefault();
+
+ // Read areas config with LINQ
xmlConfigFile
- .Descendants("areasConfig")
+ .Descendants(AREAS_CONFIG_KEY) // Get areas config node
.Elements()
.ToList()
- .ForEach(x => addKeyValue(x));
+ .ForEach(x => SetAreaValueByName(x)); // Loop through elements
}
- private static void addKeyValue(XElement element)
+ private static void SetAreaValueByName(XElement element)
{
+ // Choose which area to be set
switch (element.Name.ToString())
{
- case "production":
- SetAreasConfigValue(ref productionConfig, element);
+ case AREAS.PRODUCTION_KEY:
+ SetAreaValue(ref productionConfig, element);
break;
- case "tooling":
- SetAreasConfigValue(ref toolingConfig, element);
+ case AREAS.TOOLING_KEY:
+ SetAreaValue(ref toolingConfig, element);
break;
- case "report":
- SetAreasConfigValue(ref reportConfig, element);
+ case AREAS.REPORT_KEY:
+ SetAreaValue(ref reportConfig, element);
break;
- case "alarms":
- SetAreasConfigValue(ref alarmsConfig, element);
+ case AREAS.ALARMS_KEY:
+ SetAreaValue(ref alarmsConfig, element);
break;
- case "maintenance":
- SetAreasConfigValue(ref maintenanceConfig, element);
+ case AREAS.MAINTENANCE_KEY:
+ SetAreaValue(ref maintenanceConfig, element);
break;
- case "utilities":
- SetAreasConfigValue(ref utilitiesConfig, element);
+ case AREAS.UTILITIES_KEY:
+ SetAreaValue(ref utilitiesConfig, element);
break;
- case "scada":
- SetAreasConfigValue(ref scadaConfig, element);
+ case AREAS.SCADA_KEY:
+ SetAreaValue(ref scadaConfig, element);
break;
}
}
- private static void SetAreasConfigValue (ref AreasConfigModel areasConfig, XElement element)
+ private static void SetAreaValue (ref AreasConfigModel areasConfig, XElement element)
{
+ // Set area model with xml data
areasConfig = new AreasConfigModel()
{
- name = element.Name.ToString(),
- enabled = Convert.ToBoolean(element.Element("enabled").Value),
- allowExternalBrowser = Convert.ToBoolean(element.Element("allowExternalBrowser").Value)
+ Name = element.Name.ToString(),
+ Enabled = Convert.ToBoolean(element.Element("enabled").Value),
+ AllowExternalBrowser = Convert.ToBoolean(element.Element("allowExternalBrowser").Value)
};
}
@@ -92,5 +104,28 @@ namespace Step.Config
Console.WriteLine(e.Message);
}
}
+
+ public static bool CheckAreaStatus(string areaName)
+ { // Get Area status ( enabled field) by name
+ switch (areaName)
+ {
+ case AREAS.PRODUCTION_KEY:
+ return productionConfig.Enabled;
+ case AREAS.TOOLING_KEY:
+ return toolingConfig.Enabled;
+ case AREAS.REPORT_KEY:
+ return productionConfig.Enabled;
+ case AREAS.ALARMS_KEY:
+ return alarmsConfig.Enabled;
+ case AREAS.MAINTENANCE_KEY:
+ return maintenanceConfig.Enabled;
+ case AREAS.UTILITIES_KEY:
+ return utilitiesConfig.Enabled;
+ case AREAS.SCADA_KEY:
+ return scadaConfig.Enabled;
+ default:
+ return false;
+ }
+ }
}
}
diff --git a/Step.Config/Step.Config.csproj b/Step.Config/Step.Config.csproj
index 9aa033b1..c0c80c95 100644
--- a/Step.Config/Step.Config.csproj
+++ b/Step.Config/Step.Config.csproj
@@ -58,5 +58,10 @@
Step.Model
+
+
+ PreserveNewest
+
+
\ No newline at end of file
diff --git a/Step.Config/startupConfig.xml b/Step.Config/startupConfig.xml
new file mode 100644
index 00000000..897388da
--- /dev/null
+++ b/Step.Config/startupConfig.xml
@@ -0,0 +1,43 @@
+
+
+
+ 8080
+ 1
+ 127.0.0.1
+
+
+ 9000
+ ita
+ true
+
+
+
+ true
+ false
+
+
+ false
+ false
+
+
+ true
+ true
+
+
+ false
+ true
+
+
+ true
+ false
+
+
+ true
+ false
+
+
+ false
+ true
+
+
+
\ No newline at end of file
diff --git a/Step.Config/startupValidator.xsd b/Step.Config/startupValidator.xsd
index a1ebd836..905ed886 100644
--- a/Step.Config/startupValidator.xsd
+++ b/Step.Config/startupValidator.xsd
@@ -3,14 +3,21 @@
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
diff --git a/Step.Database/Controllers/AccessCategoriesController.cs b/Step.Database/Controllers/AccessCategoriesController.cs
deleted file mode 100644
index 1f39bc2b..00000000
--- a/Step.Database/Controllers/AccessCategoriesController.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Linq;
-using Step.Model;
-using static Step.Config.Constants;
-
-namespace Step.Database.Controllers
-{
- public class AccessCategoriesController : IDisposable
- {
- private DatabaseContext dbCtx;
-
- public AccessCategoriesController()
- {
- // Initialize database context
- dbCtx = new DatabaseContext();
- }
-
- public void Dispose()
- {
- // Clear database context
- dbCtx.Dispose();
- }
-
- public int FindCategoryLevelByAction(string categoryName, ACTIONS action)
- {
- AccessCategoryModel accessCategories = dbCtx.AccessCategories.Where(ac => ac.Name == categoryName).FirstOrDefault();
- if (accessCategories != null)
- {
- if (ACTIONS.READ == action)
- return accessCategories.ReadLevelMin;
- else
- return accessCategories.WriteLevelMin;
- }
-
- return 0;
- }
- }
-}
diff --git a/Step.Database/Controllers/FunctionAccessController.cs b/Step.Database/Controllers/FunctionAccessController.cs
new file mode 100644
index 00000000..eef566a2
--- /dev/null
+++ b/Step.Database/Controllers/FunctionAccessController.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Linq;
+using System.Web.Helpers;
+using Step.Model;
+
+namespace Step.Database.Controllers
+{
+ public class FunctionAccessController : IDisposable
+ {
+ private DatabaseContext dbCtx;
+
+ public FunctionAccessController()
+ {
+ // Initialize database context
+ dbCtx = new DatabaseContext();
+ }
+
+ public void Dispose()
+ {
+ // Clear database context
+ dbCtx.Dispose();
+ }
+
+ public FunctionAccessModel FindEnabledFunctionByName(string functionName)
+ {
+ return dbCtx
+ .FunctionsAccess
+ .Where(x => x.Name == functionName && x.Enabled == true)
+ .FirstOrDefault();
+ }
+ }
+}
diff --git a/Step.Database/DatabaseContext.cs b/Step.Database/DatabaseContext.cs
index d640ed2e..6ecafeb0 100644
--- a/Step.Database/DatabaseContext.cs
+++ b/Step.Database/DatabaseContext.cs
@@ -14,7 +14,7 @@ namespace Step.Database
{
public DbSet Users { get; set; }
public DbSet Roles { get; set; }
- public DbSet AccessCategories { get; set; }
+ public DbSet FunctionsAccess { get; set; }
public DatabaseContext()
: base("mySQLDatabaseConnection")
diff --git a/Step.Database/Step.Database.csproj b/Step.Database/Step.Database.csproj
index 4c0238d4..57808a44 100644
--- a/Step.Database/Step.Database.csproj
+++ b/Step.Database/Step.Database.csproj
@@ -66,14 +66,13 @@
-
+
-
diff --git a/Step.Model/ConfigModels/AreasConfigModel.cs b/Step.Model/ConfigModels/AreasConfigModel.cs
index 791326c5..82cbb662 100644
--- a/Step.Model/ConfigModels/AreasConfigModel.cs
+++ b/Step.Model/ConfigModels/AreasConfigModel.cs
@@ -8,8 +8,8 @@ namespace Step.Model.ConfigModels
{
public class AreasConfigModel
{
- public string name { get; set; }
- public bool enabled { get; set; }
- public bool allowExternalBrowser { get; set; }
+ public string Name { get; set; }
+ public bool Enabled { get; set; }
+ public bool AllowExternalBrowser { get; set; }
}
}
diff --git a/Step.Model/ConfigModels/NcConfigModel.cs b/Step.Model/ConfigModels/NcConfigModel.cs
new file mode 100644
index 00000000..93077774
--- /dev/null
+++ b/Step.Model/ConfigModels/NcConfigModel.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Step.Model.ConfigModels
+{
+ public class ServerConfigModel
+ {
+ public string Language { get; set; }
+ public int ServerPort { get; set; }
+ public bool EnableDirectoryBrowsing { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/Step.Model/ConfigModels/GenericConfigModel.cs b/Step.Model/ConfigModels/ServerConfigModel.cs
similarity index 70%
rename from Step.Model/ConfigModels/GenericConfigModel.cs
rename to Step.Model/ConfigModels/ServerConfigModel.cs
index 04ea13af..d13a73e3 100644
--- a/Step.Model/ConfigModels/GenericConfigModel.cs
+++ b/Step.Model/ConfigModels/ServerConfigModel.cs
@@ -6,12 +6,10 @@ using System.Threading.Tasks;
namespace Step.Model.ConfigModels
{
- public class GenericConfigModel
+ public class NcConfigModel
{
- public string Language { get; set; }
- public int ServerPort { get; set; }
public int NcVendor { get; set; }
- public int NcPort { get; set; }
public string NcIpAddress { get; set; }
+ public int NcPort { get; set; }
}
}
diff --git a/Step.Model/AccessCategoryModel.cs b/Step.Model/FunctionAccessModel.cs
similarity index 67%
rename from Step.Model/AccessCategoryModel.cs
rename to Step.Model/FunctionAccessModel.cs
index d0856012..e92b58ca 100644
--- a/Step.Model/AccessCategoryModel.cs
+++ b/Step.Model/FunctionAccessModel.cs
@@ -8,20 +8,22 @@ using System.Threading.Tasks;
namespace Step.Model
{
- [Table("access_category")]
- public class AccessCategoryModel
+ [Table("functions_access")]
+
+ public class FunctionAccessModel
{
[Key]
[Column("id")]
- public int RoleId { get; set; }
-
+ public int FunctionAccessId { get; set; }
[Column("name")]
public string Name { get; set; }
-
[Column("write_level_min")]
public int WriteLevelMin { get; set; }
-
[Column("read_level_min")]
public int ReadLevelMin { get; set; }
+ [Column("area")]
+ public string Area { get; set; }
+ [Column("enabled")]
+ public bool Enabled { get; set; }
}
}
diff --git a/Step.Model/Step.Model.csproj b/Step.Model/Step.Model.csproj
index 609301dd..c6d01618 100644
--- a/Step.Model/Step.Model.csproj
+++ b/Step.Model/Step.Model.csproj
@@ -53,9 +53,10 @@
-
+
-
+
+
DtsGenerator
RoleModel.cs.d.ts
diff --git a/Step.Model/UserModel.cs b/Step.Model/UserModel.cs
index 7848f4a1..4081c158 100644
--- a/Step.Model/UserModel.cs
+++ b/Step.Model/UserModel.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
namespace Step.Model
{
- [Table("user")]
+ [Table("users")]
public class UserModel
{
[Key]
diff --git a/Step/App.config b/Step/App.config
index 643e3ecc..e0f6a2df 100644
--- a/Step/App.config
+++ b/Step/App.config
@@ -8,7 +8,6 @@
-
diff --git a/Step/App_Start/Startup.cs b/Step/App_Start/Startup.cs
index 3830af1c..a45bdb20 100644
--- a/Step/App_Start/Startup.cs
+++ b/Step/App_Start/Startup.cs
@@ -8,8 +8,11 @@ using System.Reflection;
using Microsoft.Owin.FileSystems;
using System.Configuration;
using Microsoft.Owin.Security.OAuth;
+using Microsoft.Owin.Cors;
using Step.Provider;
-using Step.Config;
+using Microsoft.AspNet.SignalR;
+using Microsoft.AspNet.SignalR.Hubs;
+using Step.Attributes;
[assembly: OwinStartup(typeof(Step.App_Start.Startup))]
@@ -17,10 +20,9 @@ namespace Step.App_Start
{
public class Startup
{
+ public static OAuthAuthorizationServerOptions OAuthOptions;
public void Configuration(IAppBuilder app)
{
- StartupConfigController.ReadStartUpConfig();
-
// Configure HTTP
HttpConfiguration config = new HttpConfiguration();
@@ -30,13 +32,13 @@ namespace Step.App_Start
// Register Swagger config
SwaggerConfig.Register(config);
- // Configure authentication
- ConfigureOAuth(app);
-
app.UseWebApi(config);
+ // Configure api authentication
+ ConfigureWebApiOAuth(app);
+
+ // SignalR config & startup
+ SignalRConfig(app);
- // Register SignalR
- app.MapSignalR();
var directoryBrowsing = ConfigurationManager.AppSettings["enableDirectoryBrowsing"] == "true";
string rootDir = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "..", "wwwroot");
@@ -51,9 +53,10 @@ namespace Step.App_Start
app.UseFileServer(options);
}
- private void ConfigureOAuth(IAppBuilder app)
- {
- OAuthAuthorizationServerOptions OAuthOptions = new OAuthAuthorizationServerOptions
+ private void ConfigureWebApiOAuth(IAppBuilder app)
+ {
+ // Create new authorization options
+ OAuthOptions = new OAuthAuthorizationServerOptions
{
// Login and Token generation end point
TokenEndpointPath = new PathString("/Token"),
@@ -68,5 +71,25 @@ namespace Step.App_Start
// Set bearer oAuth as authentication method
app.UseOAuthBearerAuthentication(new OAuthBearerAuthenticationOptions());
}
+
+ public void SignalRConfig(IAppBuilder app)
+ {
+ //// Set up signalR config
+ //app.Map("/signalr", map =>
+ //{
+ // map.UseCors(CorsOptions.AllowAll);
+ // // Debug
+ // HubConfiguration hubConfiguration = new HubConfiguration
+ // {
+ // EnableDetailedErrors = true
+ // };
+ // // Create an istance of custom authorize attribute
+ // SignalRAuthorizeAttribute authorizer = new SignalRAuthorizeAttribute();
+ // AuthorizeModule module = new AuthorizeModule(authorizer, authorizer);
+ // GlobalHost.HubPipeline.AddModule(module);
+ // map.RunSignalR();
+ //});
+ app.MapSignalR();
+ }
}
}
diff --git a/Step/App_Start/WebApiConfig.cs b/Step/App_Start/WebApiConfig.cs
index d8b54148..a90e3454 100644
--- a/Step/App_Start/WebApiConfig.cs
+++ b/Step/App_Start/WebApiConfig.cs
@@ -26,7 +26,7 @@ namespace Step
config.Formatters.JsonFormatter.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
config.EnableCors();
-
+
// Web API routes
config.MapHttpAttributeRoutes();
diff --git a/Step/Attributes/SignalRAuthorizeAttribute.cs b/Step/Attributes/SignalRAuthorizeAttribute.cs
new file mode 100644
index 00000000..177f3ce0
--- /dev/null
+++ b/Step/Attributes/SignalRAuthorizeAttribute.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Security.Principal;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNet.SignalR;
+using Microsoft.AspNet.SignalR.Hubs;
+using Step.Config;
+using Step.Database.Controllers;
+using Step.Model;
+using static Step.Config.Constants;
+
+namespace Step.Attributes
+{
+ class SignalRAuthorizeAttribute : AuthorizeAttribute
+ {
+ public string Category;
+ public ACTIONS Action;
+ protected override bool UserAuthorized(IPrincipal user)
+ {
+ if (!base.UserAuthorized(user))
+ return false;
+
+ // Get user level stored in the bearer token
+ ClaimsIdentity identity = user.Identity as ClaimsIdentity;
+ var userRoleLevel = identity.Claims.Where(c => c.Type == ROLE_LEVEL_KEY).SingleOrDefault();
+ // User data not found -> not authorized
+ if (userRoleLevel == null)
+ return false;
+
+ // check authorization
+ if (!CheckAuthorization(Convert.ToInt32(userRoleLevel.Value), Category))
+ return false;
+
+ return true;
+ }
+
+ private bool CheckAuthorization(int userLevel, string areaName)
+ {
+ using (FunctionAccessController acController = new FunctionAccessController())
+ {
+ // Read from db category levels
+ FunctionAccessModel functionAccess = acController.FindEnabledFunctionByName(areaName);
+ if (functionAccess != null && StartupConfigController.CheckAreaStatus(functionAccess.Area))
+ {
+ if (Action == ACTIONS.READ)
+ { // Check read permissions
+ if (functionAccess.ReadLevelMin > userLevel)
+ return false; // Not authorized
+ }
+ else
+ { // Check write permissions
+ if (functionAccess.WriteLevelMin > userLevel)
+ return false; // Not authorized
+ }
+ }
+ else
+ {
+ return false;
+ }
+ // Authorized
+ return true;
+ }
+ }
+ }
+}
diff --git a/Step/Attributes/WebApiAuthorizeAttribute.cs b/Step/Attributes/WebApiAuthorizeAttribute.cs
new file mode 100644
index 00000000..fa188f83
--- /dev/null
+++ b/Step/Attributes/WebApiAuthorizeAttribute.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Linq;
+using System.Security.Claims;
+using System.Web.Http;
+using System.Web.Http.Controllers;
+using Step.Database.Controllers;
+using Step.Config;
+using static Step.Config.Constants;
+using Step.Model;
+
+namespace Step
+{
+ class WebApiAuthorizeAttribute : AuthorizeAttribute
+ {
+ public string Category;
+ public ACTIONS Action;
+ protected override bool IsAuthorized(HttpActionContext actionContext)
+ {
+ if (!base.IsAuthorized(actionContext))
+ return false;
+
+ // Get user level stored in the bearer token
+ ClaimsPrincipal principal = actionContext.RequestContext.Principal as ClaimsPrincipal;
+ var userRoleLevel = principal.Claims.Where(c => c.Type == ROLE_LEVEL_KEY).SingleOrDefault();
+ // User data not found -> not authorized
+ if (userRoleLevel == null)
+ return false;
+
+ // check authorization
+ if (!CheckAuthorization(Convert.ToInt32(userRoleLevel.Value), Category))
+ return false;
+
+ return true;
+ }
+
+ private bool CheckAuthorization(int userLevel, string areaName)
+ {
+ using (FunctionAccessController acController = new FunctionAccessController())
+ {
+ // Read from db category levels
+ FunctionAccessModel functionAccess = acController.FindEnabledFunctionByName(areaName);
+ if (functionAccess != null && StartupConfigController.CheckAreaStatus(functionAccess.Area))
+ {
+ if (Action == ACTIONS.READ)
+ { // Check read permissions
+ if (functionAccess.ReadLevelMin > userLevel)
+ return false; // Not authorized
+ }
+ else
+ { // Check write permissions
+ if (functionAccess.WriteLevelMin > userLevel)
+ return false; // Not authorized
+ }
+ }
+ else
+ {
+ return false;
+ }
+ // Authorized
+ return true;
+ }
+ }
+ }
+}
diff --git a/Step/CmsAuthorizationAttribute.cs b/Step/CmsAuthorizationAttribute.cs
deleted file mode 100644
index 0bbaa9c0..00000000
--- a/Step/CmsAuthorizationAttribute.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Linq;
-using System.Security.Claims;
-using System.Security.Principal;
-using System.Web.Http;
-using System.Web.Http.Controllers;
-using Step.Database.Controllers;
-using static Step.Config.Constants;
-
-namespace Step
-{
- class CmsAuthorizationAttribute : AuthorizeAttribute
- {
- public string Category;
- public ACTIONS Action;
- protected override bool IsAuthorized(HttpActionContext actionContext)
- {
- if (!base.IsAuthorized(actionContext))
- return false;
-
- // Get user level stored in the bearer token
- ClaimsPrincipal principal = actionContext.RequestContext.Principal as ClaimsPrincipal;
- int userLevel = Convert.ToInt32(principal.Claims.Where(c => c.Type == ROLE_LEVEL_KEY).Single().Value);
-
- if (!CheckAuthorization(userLevel))
- {
- return false;
- }
-
- return base.IsAuthorized(actionContext);
- }
-
- private bool CheckAuthorization(int userLevel)
- {
- using (AccessCategoriesController acController = new AccessCategoriesController())
- {
- // Read from db category levels
- int categoryLevel = acController.FindCategoryLevelByAction(Category, Action);
-
- if (categoryLevel > userLevel)
- {
- // Not authorized
- return false;
- }
- // Authorized
- return true;
- }
- }
- }
-}
diff --git a/Step/Controllers/DataHub.cs b/Step/Controllers/DataHub.cs
index 6a0bdae0..e2dd2792 100644
--- a/Step/Controllers/DataHub.cs
+++ b/Step/Controllers/DataHub.cs
@@ -3,6 +3,9 @@ using System.Collections.Generic;
using System.Linq;
using System.Web;
using Microsoft.AspNet.SignalR;
+using Microsoft.AspNet.SignalR.Hubs;
+using Step.Attributes;
+using static Step.Config.Constants;
namespace Step.Controllers
{
diff --git a/Step/Controllers/LoginController.cs b/Step/Controllers/LoginController.cs
index f99ed85c..be970f37 100644
--- a/Step/Controllers/LoginController.cs
+++ b/Step/Controllers/LoginController.cs
@@ -16,7 +16,7 @@ namespace Step.Controllers
return Unauthorized();
}
- [CmsAuthorization(Category = "test", Action = ACTIONS.WRITE)]
+ [WebApiAuthorize(Category = "test", Action = ACTIONS.WRITE)]
[Route("test"), HttpGet]
public IHttpActionResult Test()
{
diff --git a/Step/Provider/SignalROAuthBearerProvider.cs b/Step/Provider/SignalROAuthBearerProvider.cs
index f9b61f84..3afbcba9 100644
--- a/Step/Provider/SignalROAuthBearerProvider.cs
+++ b/Step/Provider/SignalROAuthBearerProvider.cs
@@ -6,26 +6,34 @@ using System.Linq;
using System.Threading.Tasks;
using System.Web;
-namespace Groupadoo.Web.Providers
+namespace Step.Provider
{
- public class SignalROAuthBearerProvider : OAuthBearerAuthenticationProvider
- {
-
- public override Task RequestToken(OAuthRequestTokenContext context)
+ public class SignalROAuthBearerProvider : OAuthBearerAuthenticationProvider
{
- var token = context.OwinContext.Request.Query["connectionToken"];
- if (!string.IsNullOrWhiteSpace(token))
- {
- var result = JsonConvert.DeserializeObject(token);
- if (context != null && result != null)
- context.Token = result.token;
- }
- return Task.FromResult