From 1a2b6d37bb36382ea3e5ce63963fa6000d0eeaca Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sat, 18 Apr 2015 12:45:07 +0200 Subject: [PATCH] Code builds with new Authority object; merging back to master --- Site5/Pages/v5/Ledgers/Json-InspectLedgerTxData.aspx.cs | 2 +- Site5/Pages/v5/Ledgers/Json-ResyncPreview.aspx.cs | 4 ++-- .../Pages/v5/Ledgers/Json-UnbalancedTransactions.aspx.cs | 2 +- Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs | 8 ++++---- Site5/Pages/v5/Ledgers/UploadBankFiles.aspx.cs | 4 ++-- Site5/Pages/v5/Support/StreamUpload.aspx.cs | 4 ++-- Site5/Pages/v5/Swarm/Json-ListFindPeople.aspx.cs | 4 ++-- Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Site5/Pages/v5/Ledgers/Json-InspectLedgerTxData.aspx.cs b/Site5/Pages/v5/Ledgers/Json-InspectLedgerTxData.aspx.cs index 1b3fcff0..16ac9018 100644 --- a/Site5/Pages/v5/Ledgers/Json-InspectLedgerTxData.aspx.cs +++ b/Site5/Pages/v5/Ledgers/Json-InspectLedgerTxData.aspx.cs @@ -41,7 +41,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers throw new UnauthorizedAccessException ("All the nopes in the world"); } - if (!CurrentUser.PositionAssignment.HasAccess (new Access (CurrentOrganization, AccessAspect.Bookkeeping, AccessType.Read), CurrentUser)) + if (!CurrentAuthority.HasAccess (new Access (CurrentOrganization, AccessAspect.Bookkeeping, AccessType.Read))) { throw new UnauthorizedAccessException ("Access denied because security tokens say so"); } diff --git a/Site5/Pages/v5/Ledgers/Json-ResyncPreview.aspx.cs b/Site5/Pages/v5/Ledgers/Json-ResyncPreview.aspx.cs index 3e113d43..15970fa0 100644 --- a/Site5/Pages/v5/Ledgers/Json-ResyncPreview.aspx.cs +++ b/Site5/Pages/v5/Ledgers/Json-ResyncPreview.aspx.cs @@ -114,8 +114,8 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers (ExternalBankDataProfile) Session["LedgersResync" + guid + "Profile"]; if ( - !this._authenticationData.CurrentUser.PositionAssignment.HasAccess (new Access ( - this._authenticationData.CurrentOrganization, AccessAspect.Bookkeeping, AccessType.Read), this._authenticationData.CurrentUser)) + !this._authenticationData.Authority.HasAccess (new Access ( + this._authenticationData.CurrentOrganization, AccessAspect.Bookkeeping, AccessType.Read))) { throw new UnauthorizedAccessException(); } diff --git a/Site5/Pages/v5/Ledgers/Json-UnbalancedTransactions.aspx.cs b/Site5/Pages/v5/Ledgers/Json-UnbalancedTransactions.aspx.cs index 0139e3e1..687f56a4 100644 --- a/Site5/Pages/v5/Ledgers/Json-UnbalancedTransactions.aspx.cs +++ b/Site5/Pages/v5/Ledgers/Json-UnbalancedTransactions.aspx.cs @@ -15,7 +15,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers List rows = new List(); if ( - CurrentUser.PositionAssignment.HasAccess (new Access (CurrentOrganization, AccessAspect.BookkeepingDetails, AccessType.Read), CurrentUser)) + CurrentAuthority.HasAccess (new Access (CurrentOrganization, AccessAspect.BookkeepingDetails, AccessType.Read))) { foreach (FinancialTransaction transaction in unbalancedTransactions) { diff --git a/Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs b/Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs index 93c5a1ce..187c02b6 100644 --- a/Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs +++ b/Site5/Pages/v5/Ledgers/ResyncExternalAccount.aspx.cs @@ -156,8 +156,8 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers FinancialAccount account = FinancialAccount.FromIdentity (accountId); if (account.Organization.Identity != authData.CurrentOrganization.Identity || - !authData.CurrentUser.PositionAssignment.HasAccess (new Access (authData.CurrentOrganization, AccessAspect.Bookkeeping, - AccessType.Write), authData.CurrentUser)) + !authData.Authority.HasAccess (new Access (authData.CurrentOrganization, AccessAspect.Bookkeeping, + AccessType.Write))) { throw new UnauthorizedAccessException(); } @@ -177,8 +177,8 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers AuthenticationData authenticationData = GetAuthenticationDataAndCulture(); if ( - !authenticationData.CurrentUser.PositionAssignment.HasAccess (new Access (authenticationData.CurrentOrganization, - AccessAspect.Bookkeeping, AccessType.Write), authenticationData.CurrentUser)) + !authenticationData.Authority.HasAccess (new Access (authenticationData.CurrentOrganization, + AccessAspect.Bookkeeping, AccessType.Write))) { throw new UnauthorizedAccessException(); } diff --git a/Site5/Pages/v5/Ledgers/UploadBankFiles.aspx.cs b/Site5/Pages/v5/Ledgers/UploadBankFiles.aspx.cs index 4e69d45e..f5713563 100644 --- a/Site5/Pages/v5/Ledgers/UploadBankFiles.aspx.cs +++ b/Site5/Pages/v5/Ledgers/UploadBankFiles.aspx.cs @@ -229,8 +229,8 @@ namespace Swarmops.Site.Pages.Ledgers FinancialAccount account = FinancialAccount.FromIdentity (accountId); if (account.Organization.Identity != authData.CurrentOrganization.Identity || - !authData.CurrentUser.PositionAssignment.HasAccess (new Access (authData.CurrentOrganization, AccessAspect.Bookkeeping, - AccessType.Write), authData.CurrentUser)) + !authData.Authority.HasAccess (new Access (authData.CurrentOrganization, AccessAspect.Bookkeeping, + AccessType.Write))) { throw new UnauthorizedAccessException(); } diff --git a/Site5/Pages/v5/Support/StreamUpload.aspx.cs b/Site5/Pages/v5/Support/StreamUpload.aspx.cs index 8f04ebe6..bc822ac1 100644 --- a/Site5/Pages/v5/Support/StreamUpload.aspx.cs +++ b/Site5/Pages/v5/Support/StreamUpload.aspx.cs @@ -78,8 +78,8 @@ namespace Swarmops.Pages.v5.Support // TODO: Security leak - check CurrentOrganization against Document's org if ( - CurrentUser.PositionAssignment.HasAccess (new Access (CurrentOrganization, AccessAspect.Financials, - AccessType.Write), CurrentUser)) + CurrentAuthority.HasAccess (new Access (CurrentOrganization, AccessAspect.Financials, + AccessType.Write))) { hasPermission = true; } diff --git a/Site5/Pages/v5/Swarm/Json-ListFindPeople.aspx.cs b/Site5/Pages/v5/Swarm/Json-ListFindPeople.aspx.cs index 99f35589..d439bf8c 100644 --- a/Site5/Pages/v5/Swarm/Json-ListFindPeople.aspx.cs +++ b/Site5/Pages/v5/Swarm/Json-ListFindPeople.aspx.cs @@ -20,8 +20,8 @@ namespace Swarmops.Frontend.Pages.Swarm Geography geography = Geography.FromIdentity (geographyId); if ( - !CurrentUser.PositionAssignment.HasAccess (new Access (CurrentOrganization, geography, AccessAspect.PersonalData, - AccessType.Read), CurrentUser)) + !CurrentAuthority.HasAccess (new Access (CurrentOrganization, geography, AccessAspect.PersonalData, + AccessType.Read))) { throw new UnauthorizedAccessException ("nope"); } diff --git a/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs b/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs index 7489dde1..05bd4543 100644 --- a/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs +++ b/Site5/Pages/v5/Swarm/ListFindPeople.aspx.cs @@ -51,8 +51,8 @@ namespace Swarmops.Frontend.Pages.Swarm AuthenticationData authData = GetAuthenticationDataAndCulture(); if ( - !authData.CurrentUser.PositionAssignment.HasAccess (new Access (authData.CurrentOrganization, AccessAspect.Financials, - AccessType.Write), authData.CurrentUser)) + !authData.Authority.HasAccess (new Access (authData.CurrentOrganization, AccessAspect.Financials, + AccessType.Write))) { throw new SecurityAccessDeniedException ("Insufficient privileges for operation"); }