small refactoring in premissions related to zone and superuser check

2sic · Sep 19, 2018 · 7d3963d · 7d3963d
1 parent c86abc3
commit 7d3963d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config
@@ -217,6 +217,14 @@
                     <binding protocol="http" bindingInformation="*:20088:localhost" />
                 </bindings>
             </site>
+            <site name="2sxc(3)" id="9">
+                <application path="/" applicationPool="Clr4IntegratedAppPool">
+                    <virtualDirectory path="/" physicalPath="C:\Projects\2sxc-dnn742\Website\DesktopModules\ToSIC_SexyContent" />
+                </application>
+                <bindings>
+                    <binding protocol="http" bindingInformation="*:3329:localhost" />
+                </bindings>
+            </site>
             <siteDefaults>
                 <logFile logFormat="W3C" directory="%IIS_USER_HOME%\Logs" />
                 <traceFailedRequestsLogging directory="%IIS_USER_HOME%\TraceLogFiles" enabled="true" maxLogFileSizeKB="1024" />

diff --git a/Sxc WebApi/Permissions/MultiPermissionsApp.cs b/Sxc WebApi/Permissions/MultiPermissionsApp.cs
@@ -48,7 +48,7 @@ protected override Dictionary<string, IPermissionCheck> InitializePermissionChec
                 {"App", BuildPermissionChecker()}
             };
 
-        public override bool ZoneChangedAndNotSuperUser(out HttpResponseException exp)
+        public override bool ZoneAsInContextOrSuperUser(out HttpResponseException exp)
         {
             var wrapLog = Log.Call("ZoneChangedAndNotSuperUser()");
             var zoneSameOrSuperUser = SamePortal || PortalSettings.Current.UserInfo.IsSuperUser;
@@ -57,7 +57,7 @@ public override bool ZoneChangedAndNotSuperUser(out HttpResponseException exp)
 
             wrapLog(zoneSameOrSuperUser ? $"sameportal:{SamePortal} - ok": "not ok, generate error");
 
-            return !zoneSameOrSuperUser;
+            return zoneSameOrSuperUser;
         }
 
 

diff --git a/Sxc WebApi/Permissions/MultiPermissionsBase.cs b/Sxc WebApi/Permissions/MultiPermissionsBase.cs
@@ -27,7 +27,7 @@ protected MultiPermissionsBase(string logName, Log parentLog) : base(logName, pa
 
         protected abstract Dictionary<string, IPermissionCheck> InitializePermissionChecks();
 
-        public abstract bool ZoneChangedAndNotSuperUser(out HttpResponseException exp);
+        public abstract bool ZoneAsInContextOrSuperUser(out HttpResponseException exp);
 
         #endregion
 
@@ -80,7 +80,7 @@ protected bool Ensure(List<Grants> grants, KeyValuePair<string, IPermissionCheck
 
         public bool SameAppOrIsSuperUserAndEnsure(List<Grants> grants, out HttpResponseException preparedException)
         {
-            if (!ZoneChangedAndNotSuperUser(out preparedException))
+            if (!ZoneAsInContextOrSuperUser(out preparedException))
                 return false;
             if (!Ensure(grants, out preparedException))
                 return false;

diff --git a/Sxc WebApi/SystemController.cs b/Sxc WebApi/SystemController.cs
@@ -118,7 +118,7 @@ public void App(int zoneId, string name)
         public dynamic DialogSettings(int appId)
         {
             var appAndPerms = new MultiPermissionsApp(SxcInstance, appId, Log);
-            if (appAndPerms.ZoneChangedAndNotSuperUser(out var exp))
+            if (!appAndPerms.ZoneAsInContextOrSuperUser(out var exp))
                 throw exp;
 
             //var appIdentity = new AppPermissionBeforeUsing(SxcInstance, Log)