From 2bb383ab75ff61e309339d3a9f2941d321bfffce Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Thu, 21 Feb 2013 00:50:16 +0000 Subject: [PATCH] Temporary access control complete, committing / shipping --- Logic/Swarm/Person.cs | 40 +++++++++---------- .../v5/Financial/Json-PayableCosts.aspx.cs | 2 +- Site5/Pages/v5/Financial/PayOutMoney.aspx.cs | 2 +- .../Ledgers/Json-OutstandingAccounts.aspx.cs | 2 +- 4 files changed, 21 insertions(+), 25 deletions(-) diff --git a/Logic/Swarm/Person.cs b/Logic/Swarm/Person.cs index a07f56cf..5db1157e 100644 --- a/Logic/Swarm/Person.cs +++ b/Logic/Swarm/Person.cs @@ -1040,38 +1040,34 @@ namespace Swarmops.Logic.Swarm return true; } - bool result = false; + // TEMPORARY access control lists // TODO: Build access control list from org chart, compare against required access - // For now, return true if Anna, Janne, or Rick. Bad hack, bad, really bad. + string ids = string.Empty; - if (this.Identity == 1) + if (access.Type == AccessType.Write) { - return true; + ids = access.Organization.Parameters.TemporaryAccessListWrite; + } + else if (access.Type == AccessType.Read) + { + ids = access.Organization.Parameters.TemporaryAccessListWrite + " " + access.Organization.Parameters.TemporaryAccessListRead; // Write access implies read access } - if (this.Identity == 11443) + + List resultingPeople = new List(); + string[] idStrings = ids.Trim().Replace(" ", " ").Split(' '); + + foreach (string idString in idStrings) { - return true; + if (Int32.Parse(idString) == this.Identity) + { + return true; + } } - if (this.Identity == 378) - { - return true; - } - - if (this.Identity == 15719) - { - return true; - } - - if (this.Identity == 71888) - { - return true; // Henrik Brändén - } - - return result; + return false; } } } diff --git a/Site5/Pages/v5/Financial/Json-PayableCosts.aspx.cs b/Site5/Pages/v5/Financial/Json-PayableCosts.aspx.cs index 9e10a173..9e02836c 100644 --- a/Site5/Pages/v5/Financial/Json-PayableCosts.aspx.cs +++ b/Site5/Pages/v5/Financial/Json-PayableCosts.aspx.cs @@ -21,7 +21,7 @@ namespace Swarmops.Frontend.Pages.Financial { // Access required is change access to financials - this.PageAccessRequired = new Access(AccessAspect.Financials, AccessType.Write); + this.PageAccessRequired = new Access(this.CurrentOrganization, AccessAspect.Financials, AccessType.Write); // Get all payable items diff --git a/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs b/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs index 65a6e28d..a41bc6b6 100644 --- a/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs +++ b/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs @@ -58,7 +58,7 @@ namespace Swarmops.Frontend.Pages.Financial AuthenticationData authData = GetAuthenticationDataAndCulture(); - if (!authData.CurrentUser.HasAccess(new Access(AccessAspect.Financials, AccessType.Write))) + if (!authData.CurrentUser.HasAccess(new Access(authData.CurrentOrganization, AccessAspect.Financials, AccessType.Write))) { throw new SecurityAccessDeniedException("Insufficient privileges for operation"); } diff --git a/Site5/Pages/v5/Ledgers/Json-OutstandingAccounts.aspx.cs b/Site5/Pages/v5/Ledgers/Json-OutstandingAccounts.aspx.cs index 70ee8845..703a8afe 100644 --- a/Site5/Pages/v5/Ledgers/Json-OutstandingAccounts.aspx.cs +++ b/Site5/Pages/v5/Ledgers/Json-OutstandingAccounts.aspx.cs @@ -15,7 +15,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers { protected void Page_Load(object sender, EventArgs e) { - this.PageAccessRequired = new Access(AccessAspect.Financials, AccessType.Read); + this.PageAccessRequired = new Access(this.CurrentOrganization, AccessAspect.Financials, AccessType.Read); _authenticationData = GetAuthenticationDataAndCulture(); OutstandingAccountType accountType = OutstandingAccountType.Expenses;