From 125360129d8a366cf86cbe9b2bb54ecaa240770a Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Fri, 20 Mar 2015 19:56:26 +0100 Subject: [PATCH] Security fix for ChangeOrg (re-enabling the page) --- Logic/Security/Accesses.cs | 6 +++--- Logic/Structure/Organization.cs | 2 +- Site5/Pages/v5/Security/SetCurrentOrganization.aspx.cs | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Logic/Security/Accesses.cs b/Logic/Security/Accesses.cs index abf7c7f8..630224a8 100644 --- a/Logic/Security/Accesses.cs +++ b/Logic/Security/Accesses.cs @@ -9,20 +9,20 @@ namespace Swarmops.Logic.Security public readonly Organization Organization; public readonly AccessType Type; - public Access (AccessAspect aspect, AccessType type) + public Access (AccessAspect aspect, AccessType type = AccessType.Write) // Default to demanding r/w access unless r/o specified { this.Aspect = aspect; this.Type = type; } - public Access (Organization organization, AccessAspect aspect, AccessType type) + public Access (Organization organization, AccessAspect aspect, AccessType type = AccessType.Write) { this.Organization = organization; this.Aspect = aspect; this.Type = type; } - public Access (Organization organization, Geography geography, AccessAspect aspect, AccessType type) + public Access(Organization organization, Geography geography, AccessAspect aspect, AccessType type = AccessType.Write) { this.Organization = organization; this.Geography = geography; diff --git a/Logic/Structure/Organization.cs b/Logic/Structure/Organization.cs index e73aee9e..cda59e69 100644 --- a/Logic/Structure/Organization.cs +++ b/Logic/Structure/Organization.cs @@ -457,7 +457,7 @@ namespace Swarmops.Logic.Structure FinancialAccounts[OrganizationFinancialAccountType.CostsInfrastructure] = FinancialAccount.Create (this, "[LOC]Cost_IctInfrastructure", FinancialAccountType.Cost, null); FinancialAccounts[OrganizationFinancialAccountType.CostsYearlyResult] = - FinancialAccount.Create (this, "[LOC]Cost_YearlyResult", FinancialAccountType.Cost, null); + FinancialAccount.Create (this, "[LOC]Cost_AnnualResult", FinancialAccountType.Cost, null); FinancialAccounts[OrganizationFinancialAccountType.DebtsEquity] = FinancialAccount.Create (this, "[LOC]Debt_Equity", FinancialAccountType.Debt, null); FinancialAccounts[OrganizationFinancialAccountType.DebtsExpenseClaims] = diff --git a/Site5/Pages/v5/Security/SetCurrentOrganization.aspx.cs b/Site5/Pages/v5/Security/SetCurrentOrganization.aspx.cs index dccd0aa7..e99c7c27 100644 --- a/Site5/Pages/v5/Security/SetCurrentOrganization.aspx.cs +++ b/Site5/Pages/v5/Security/SetCurrentOrganization.aspx.cs @@ -2,6 +2,7 @@ using System.Globalization; using System.Web; using System.Web.Security; +using Swarmops.Logic.Security; using Swarmops.Logic.Structure; namespace Swarmops.Frontend.Pages.v5.Security @@ -15,6 +16,8 @@ namespace Swarmops.Frontend.Pages.v5.Security throw new UnauthorizedAccessException ("No"); // may cause problems on login screen? } + PageAccessRequired = new Access (AccessAspect.Null); + string returnUrlString = Request.QueryString["ReturnUrl"]; string organizationIdString = Request.QueryString["OrganizationId"]; int organizationId = Int32.Parse (organizationIdString);