diff --git a/Logic/Security/Accesses.cs b/Logic/Security/Accesses.cs
index b23d17bc..abf7c7f8 100644
--- a/Logic/Security/Accesses.cs
+++ b/Logic/Security/Accesses.cs
@@ -74,8 +74,27 @@ namespace Swarmops.Logic.Security
///
/// Access to this Swarmops installation and its operating parameters
///
- System
+ System,
+ ///
+ /// Null security: disable security checks entirely, like for Dashboard where each component rolls their own
+ ///
+ Null,
+
+ ///
+ /// Uniquely identified person (logged on) in a specific org. Write access means they can submit expense reports on their own behalf &c.
+ ///
+ Participant,
+
+ ///
+ /// Can enter received invoices, paper letters, etc.
+ ///
+ Secretarial,
+
+ ///
+ /// Access to personalized salary data (implies financial read access)
+ ///
+ Payroll
}
public enum AccessType
diff --git a/Logic/Swarm/Person.cs b/Logic/Swarm/Person.cs
index c9f9b373..34697fda 100644
--- a/Logic/Swarm/Person.cs
+++ b/Logic/Swarm/Person.cs
@@ -1110,6 +1110,13 @@ namespace Swarmops.Logic.Swarm
string ids = string.Empty;
+ if (access.Aspect == AccessAspect.Null)
+ {
+ // Null security (like Dashboard), so return true
+
+ return true;
+ }
+
if (access.Type == AccessType.Write)
{
ids = access.Organization.Parameters.TemporaryAccessListWrite;
diff --git a/Site5/App_Code/PageV5Base.cs b/Site5/App_Code/PageV5Base.cs
index a79be5b1..28f6d151 100644
--- a/Site5/App_Code/PageV5Base.cs
+++ b/Site5/App_Code/PageV5Base.cs
@@ -1,4 +1,5 @@
using System;
+using System.Security;
using System.Web;
using System.Web.UI;
using Swarmops.Common.Enums;
@@ -7,6 +8,7 @@ using Swarmops.Logic.Security;
using Swarmops.Logic.Structure;
using Swarmops.Logic.Support;
using Swarmops.Logic.Swarm;
+using PermissionSet = Swarmops.Logic.Security.PermissionSet;
///
/// Base class to use for all data generators (JSON, etc). It supplies identification and localization.
@@ -92,6 +94,13 @@ public class PageV5Base : Page
protected override void OnPreRender (EventArgs e)
{
+ // Check that the page has security defined
+
+ if (this.PageAccessRequired == null)
+ {
+ throw new SecurityException("Page security is undefined at " + this.GetType().FullName + ". This is not permitted: minimum security must be defined for every page.");
+ }
+
// Check security of page against users's credentials
if (!CurrentUser.HasAccess (this.PageAccessRequired))
diff --git a/Site5/Default.aspx.cs b/Site5/Default.aspx.cs
index 726975d1..cb080ecd 100644
--- a/Site5/Default.aspx.cs
+++ b/Site5/Default.aspx.cs
@@ -1,6 +1,7 @@
using System;
using Resources;
using Swarmops.Logic.Financial;
+using Swarmops.Logic.Security;
public partial class Default : PageV5Base
{
@@ -8,6 +9,7 @@ public partial class Default : PageV5Base
{
PageTitle = Global.Dashboard_PageTitle;
PageIcon = "iconshock-steering-wheel";
+ this.PageAccessRequired = new Access(AccessAspect.Null, AccessType.Read); // dummy security until there's something to show on Dashboard
/*
this.LabelActionListMotions.Text = Resources.Pages.Governance.ListMotions_PageTitle;
diff --git a/Site5/Master-v5.master b/Site5/Master-v5.master
index 88a56c10..8d4b21e1 100644
--- a/Site5/Master-v5.master
+++ b/Site5/Master-v5.master
@@ -126,7 +126,7 @@
diff --git a/Site5/Master-v5.master.cs b/Site5/Master-v5.master.cs
index 91c3ab8d..0c8121cb 100644
--- a/Site5/Master-v5.master.cs
+++ b/Site5/Master-v5.master.cs
@@ -174,6 +174,13 @@ namespace Swarmops
this.LiteralBodyClass.Text = "rtl";
}
+ // If we're running as an open-something identity, remove the Preferences div
+
+ if (CurrentUser.Identity < 0)
+ {
+ this.LiteralDocumentReadyHook.Text += @" $('#divUserPreferences').hide();";
+ }
+
}
private void SetupDropboxes()
diff --git a/Site5/Pages/v5/Comms/SendMassMessage.aspx.cs b/Site5/Pages/v5/Comms/SendMassMessage.aspx.cs
index d7e99365..5dd85636 100644
--- a/Site5/Pages/v5/Comms/SendMassMessage.aspx.cs
+++ b/Site5/Pages/v5/Comms/SendMassMessage.aspx.cs
@@ -3,6 +3,7 @@ using System.Web.Services;
using System.Web.UI;
using System.Web.UI.WebControls;
using Resources;
+using Swarmops.Logic.Security;
using Swarmops.Logic.Structure;
using Swarmops.Logic.Swarm;
@@ -16,6 +17,8 @@ namespace Swarmops.Frontend.Pages.Comms
PageTitle = Resources.Pages.Comms.SendMassMessage_Title;
InfoBoxLiteral = Resources.Pages.Comms.SendMassMessage_Info;
+ PageAccessRequired = new Access (CurrentOrganization, AccessAspect.Correspondence, AccessType.Write);
+
if (!Page.IsPostBack)
{
Localize();
diff --git a/Site5/Pages/v5/Financial/AttestCosts.aspx.cs b/Site5/Pages/v5/Financial/AttestCosts.aspx.cs
index b1d4998d..8f4e54d1 100644
--- a/Site5/Pages/v5/Financial/AttestCosts.aspx.cs
+++ b/Site5/Pages/v5/Financial/AttestCosts.aspx.cs
@@ -6,6 +6,7 @@ using System.Web;
using System.Web.Services;
using Resources;
using Swarmops.Logic.Financial;
+using Swarmops.Logic.Security;
using Swarmops.Logic.Support;
using Swarmops.Logic.Swarm;
@@ -26,6 +27,8 @@ namespace Swarmops.Frontend.Pages.v5.Financial
PageIcon = "iconshock-stamped-paper";
+ PageAccessRequired = new Access (CurrentOrganization, AccessAspect.Participant, AccessType.Read); // No specific access aspect for owning a budget (yet?)
+
if (!Page.IsPostBack)
{
Localize();
diff --git a/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs b/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs
index c3017957..dfb48898 100644
--- a/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs
+++ b/Site5/Pages/v5/Financial/CreateInboundInvoice.aspx.cs
@@ -4,6 +4,7 @@ using System.Globalization;
using System.Web;
using Resources;
using Swarmops.Logic.Financial;
+using Swarmops.Logic.Security;
using Swarmops.Logic.Support;
namespace Swarmops.Frontend.Pages.v5.Financial
@@ -92,6 +93,8 @@ namespace Swarmops.Frontend.Pages.v5.Financial
PageIcon = "iconshock-invoice";
InfoBoxLiteral = Resources.Pages.Financial.CreateInboundInvoice_Info;
+ PageAccessRequired = new Access (CurrentOrganization, AccessAspect.Secretarial, AccessType.Write);
+
if (!Page.IsPostBack)
{
// Prime bank details
diff --git a/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs b/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs
index 2dbab8e7..b09eb81d 100644
--- a/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs
+++ b/Site5/Pages/v5/Financial/FileExpenseClaim.aspx.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Globalization;
using System.Web;
using Swarmops.Logic.Financial;
+using Swarmops.Logic.Security;
using Swarmops.Logic.Support;
namespace Swarmops.Frontend.Pages.v5.Financial
@@ -97,6 +98,8 @@ namespace Swarmops.Frontend.Pages.v5.Financial
PageIcon = "iconshock-moneyback";
InfoBoxLiteral = Resources.Pages.Financial.FileExpenseClaim_Info;
+ PageAccessRequired = new Access (CurrentOrganization, AccessAspect.Participant, AccessType.Write);
+
if (!Page.IsPostBack)
{
// Prime bank details
diff --git a/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs b/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs
index 40115185..20909f9d 100644
--- a/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs
+++ b/Site5/Pages/v5/Financial/PayOutMoney.aspx.cs
@@ -19,6 +19,8 @@ namespace Swarmops.Frontend.Pages.Financial
return;
}
+ PageAccessRequired = new Access (CurrentOrganization, AccessAspect.Financials, AccessType.Write);
+
PageIcon = "iconshock-money-envelope";
if (!Page.IsPostBack)
diff --git a/Site5/Pages/v5/Financial/RequestCashAdvance.aspx.cs b/Site5/Pages/v5/Financial/RequestCashAdvance.aspx.cs
index 90d9e62d..43f6642f 100644
--- a/Site5/Pages/v5/Financial/RequestCashAdvance.aspx.cs
+++ b/Site5/Pages/v5/Financial/RequestCashAdvance.aspx.cs
@@ -2,6 +2,7 @@
using System.Globalization;
using System.Web;
using Swarmops.Logic.Financial;
+using Swarmops.Logic.Security;
namespace Swarmops.Frontend.Pages.v5.Financial
{
@@ -19,6 +20,8 @@ namespace Swarmops.Frontend.Pages.v5.Financial
PageIcon = "iconshock-walletmoney";
InfoBoxLiteral = Resources.Pages.Financial.RequestCashAdvance_Info;
+ PageAccessRequired = new Access (CurrentOrganization, AccessAspect.Participant, AccessType.Write);
+
if (!Page.IsPostBack)
{
// Prime bank details
diff --git a/Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs b/Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs
index a4633d6a..f9ac622f 100644
--- a/Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs
+++ b/Site5/Pages/v5/Financial/ValidateReceipts.aspx.cs
@@ -23,10 +23,7 @@ namespace Swarmops.Frontend.Pages.v5.Financial
return;
}
- if (!CurrentUser.HasAccess (new Access (CurrentOrganization, AccessAspect.Financials, AccessType.Write)))
- {
- throw new UnauthorizedAccessException();
- }
+ PageAccessRequired = new Access (CurrentOrganization, AccessAspect.Financials, AccessType.Write);
PageIcon = "iconshock-invoice-greentick";
diff --git a/Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs b/Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs
index 15f6f2be..ec0e9a82 100644
--- a/Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs
+++ b/Site5/Pages/v5/Ledgers/BalanceSheet.aspx.cs
@@ -1,5 +1,6 @@
using System;
using System.Globalization;
+using Swarmops.Logic.Security;
namespace Swarmops.Frontend.Pages.v5.Ledgers
{
@@ -17,6 +18,18 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
PageTitle = Resources.Pages.Ledgers.BalanceSheet_PageTitle;
InfoBoxLiteral = Resources.Pages.Ledgers.BalanceSheet_Info;
+ // Security: If the org has open ledgers, then anyone may read. Otherwise, Financials.Read.
+
+ if (!String.IsNullOrEmpty (CurrentOrganization.OpenLedgersDomain))
+ {
+ PageAccessRequired = new Access (AccessAspect.Null, AccessType.Read);
+ }
+ else
+ {
+ PageAccessRequired = new Access (CurrentOrganization, AccessAspect.Financials, AccessType.Read);
+ }
+
+
if (!Page.IsPostBack)
{
int year = DateTime.Today.Year;
diff --git a/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs b/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs
index d31133ee..a5ca4312 100644
--- a/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs
+++ b/Site5/Pages/v5/Ledgers/ProfitLossStatement.aspx.cs
@@ -1,6 +1,7 @@
using System;
using System.Globalization;
using Resources.Pages;
+using Swarmops.Logic.Security;
public partial class Pages_v5_Ledgers_ProfitLossStatement : PageV5Base
{
@@ -16,6 +17,18 @@ public partial class Pages_v5_Ledgers_ProfitLossStatement : PageV5Base
PageTitle = Ledgers.ProfitLossStatement_PageTitle;
InfoBoxLiteral = Ledgers.ProfitLossStatement_Info;
+ // Security: If the org has open ledgers, then anyone may read. Otherwise, Financials.Read.
+
+ if (!String.IsNullOrEmpty(CurrentOrganization.OpenLedgersDomain))
+ {
+ PageAccessRequired = new Access(AccessAspect.Null, AccessType.Read);
+ }
+ else
+ {
+ PageAccessRequired = new Access(CurrentOrganization, AccessAspect.Financials, AccessType.Read);
+ }
+
+
if (!Page.IsPostBack)
{
int year = DateTime.Today.Year;
diff --git a/Site5/Pages/v5/Ledgers/TaxForms/PayrollForms.aspx.cs b/Site5/Pages/v5/Ledgers/TaxForms/PayrollForms.aspx.cs
index b5f8f2e8..cce82f7e 100644
--- a/Site5/Pages/v5/Ledgers/TaxForms/PayrollForms.aspx.cs
+++ b/Site5/Pages/v5/Ledgers/TaxForms/PayrollForms.aspx.cs
@@ -1,6 +1,7 @@
using System;
using System.Globalization;
using System.Web.UI.WebControls;
+using Swarmops.Logic.Security;
namespace Swarmops.Frontend.Pages.v5.Ledgers.TaxForms
{
@@ -18,6 +19,8 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers.TaxForms
PageTitle = Resources.Pages.Financial.PayrollTaxForms_PageTitle;
InfoBoxLiteral = Resources.Pages.Financial.PayrollTaxForms_Info;
+ PageAccessRequired = new Access (CurrentOrganization, AccessAspect.Payroll, AccessType.Read);
+
if (!Page.IsPostBack)
{
// TODO: DETERMINE COUNTRIES ON PAYROLL
diff --git a/Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs b/Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs
index 143d2543..c45f5dda 100644
--- a/Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs
+++ b/Site5/Pages/v5/Ledgers/ViewOutstandingAccounts.aspx.cs
@@ -2,6 +2,7 @@
using System.Globalization;
using System.Web.UI.WebControls;
using Resources;
+using Swarmops.Logic.Security;
namespace Swarmops.Frontend.Pages.v5.Ledgers
{
@@ -16,6 +17,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
}
PageIcon = "iconshock-cabinet";
+ PageAccessRequired = new Access (CurrentOrganization, AccessAspect.Financials, AccessType.Read);
if (!Page.IsPostBack)
{
diff --git a/Site5/Pages/v5/Swarm/AddPerson.aspx.cs b/Site5/Pages/v5/Swarm/AddPerson.aspx.cs
index cadf9986..5f6aee11 100644
--- a/Site5/Pages/v5/Swarm/AddPerson.aspx.cs
+++ b/Site5/Pages/v5/Swarm/AddPerson.aspx.cs
@@ -38,6 +38,8 @@ namespace Swarmops.Frontend.Pages.v5.Swarm
this.TextName.Focus();
}
+
+ this.PageAccessRequired = new Access (CurrentOrganization, AccessAspect.PersonalData, AccessType.Write);
}
private void Populate()
diff --git a/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs b/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs
index a898a249..22065749 100644
--- a/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs
+++ b/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs
@@ -16,6 +16,7 @@ namespace Swarmops.Frontend.Pages.Swarm
protected void Page_Load (object sender, EventArgs e)
{
PageIcon = "iconshock-group-search";
+ this.PageAccessRequired = new Access (CurrentOrganization, AccessAspect.PersonalData, AccessType.Read);
if (!Page.IsPostBack)
{