support both 404 andf 403 status codes in API response (404 should not log)

Oqtane.Client/Services/ServiceBase.cs

@@ -206,7 +206,6 @@ namespace Oqtane.Services
                 Console.WriteLine($"Request: {response.RequestMessage.RequestUri}");
                 Console.WriteLine($"Response status: {response.StatusCode} {response.ReasonPhrase}");
             }
-
             return false;
         }
 

Oqtane.Server/Controllers/FileController.cs

@@ -122,9 +122,16 @@ namespace Oqtane.Controllers
                 return file;
             }
             else
+            {
+                if (file != null)
                 {
                     _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized File Get Attempt {FileId}", id);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }
@@ -144,6 +151,10 @@ namespace Oqtane.Controllers
                     _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized File Get Attempt {Name} For Folder {FolderId}", name, folderId);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/FolderController.cs

@@ -69,9 +69,16 @@ namespace Oqtane.Controllers
                 return folder;
             }
             else
+            {
+                if (folder != null)
                 {
                     _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Folder Get Attempt {FolderId}", id);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }
@@ -90,9 +97,16 @@ namespace Oqtane.Controllers
                 return folder;
             }
             else
+            {
+                if (folder != null)
                 {
                     _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Folder Get Attempt {Path} For Site {SiteId}", path, siteId);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/LanguageController.cs

@@ -88,9 +88,16 @@ namespace Oqtane.Controllers
                 return language;
             }
             else
+            {
+                if (language != null)
                 {
                     _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Language Get Attempt {LanguageId}", id);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/ModuleController.cs

@@ -112,9 +112,16 @@ namespace Oqtane.Controllers
                 return module;
             }
             else
+            {
+                if (module != null)
                 {
                     _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Module Get Attempt {ModuleId}", id);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/ModuleDefinitionController.cs

@@ -89,15 +89,22 @@ namespace Oqtane.Controllers
             if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
             {
                 ModuleDefinition moduledefinition = _moduleDefinitions.GetModuleDefinition(id, SiteId);
-                if (_userPermissions.IsAuthorized(User, PermissionNames.Utilize, moduledefinition.PermissionList))
+                if (moduledefinition != null && _userPermissions.IsAuthorized(User, PermissionNames.Utilize, moduledefinition.PermissionList))
                 {
-                    if (string.IsNullOrEmpty(moduledefinition.Version)) moduledefinition.Version = new Version(1, 0, 0).ToString();
+                    moduledefinition.Version = (string.IsNullOrEmpty(moduledefinition.Version)) ? new Version(1, 0, 0).ToString() : moduledefinition.Version;
                     return moduledefinition;
                 }
                 else
+                {
+                    if (moduledefinition != null)
                     {
                         _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized ModuleDefinition Get Attempt {ModuleDefinitionId} {SiteId}", id, siteid);
                         HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                    }
+                    else
+                    {
+                        HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                    }
                     return null;
                 }
             }

Oqtane.Server/Controllers/NotificationController.cs

@@ -140,9 +140,16 @@ namespace Oqtane.Controllers
                 return notification;
             }
             else
+            {
+                if (notification != null)
                 {
                     _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Notification Get Attempt {NotificationId}", id);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/PageController.cs

@@ -86,9 +86,16 @@ namespace Oqtane.Controllers
                 return page;
             }
             else
+            {
+                if (page != null)
                 {
                     _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Get Attempt {PageId}", id);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }
@@ -112,6 +119,10 @@ namespace Oqtane.Controllers
                     _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Get Attempt {SiteId} {Path}", siteid, path);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/PageModuleController.cs

@@ -43,9 +43,16 @@ namespace Oqtane.Controllers
                 return pagemodule;
             }
             else
+            {
+                if (pagemodule != null)
                 {
                     _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized PageModule Get Attempt {PageModuleId}", id);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }
@@ -60,9 +67,16 @@ namespace Oqtane.Controllers
                 return pagemodule;
             }
             else
+            {
+                if (pagemodule != null)
                 {
                     _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized PageModule Get Attempt {PageId} {ModuleId}", pageid, moduleid);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/ProfileController.cs

@@ -55,9 +55,16 @@ namespace Oqtane.Controllers
                 return profile;
             }
             else
+            {
+                if (profile != null)
                 {
                     _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Profile Get Attempt {ProfileId}", id);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/RoleController.cs

@@ -59,9 +59,16 @@ namespace Oqtane.Controllers
                 return role;
             }
             else
+            {
+                if (role != null)
                 {
                     _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Role Get Attempt {RoleId}", id);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/SettingController.cs

@@ -89,11 +89,15 @@ namespace Oqtane.Controllers
             }
             else
             {
-                if (entityName != EntityNames.Visitor)
+                if (setting != null && entityName != EntityNames.Visitor)
                 {
                     _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Setting {EntityName} {SettingId}", entityName, id);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/SiteController.cs

@@ -79,7 +79,7 @@ namespace Oqtane.Controllers
         private Site GetSite(int siteid)
         {
             var site = _sites.GetSite(siteid);
-            if (site.SiteId == _alias.SiteId)
+            if (site != null && site.SiteId == _alias.SiteId)
             {
                 // site settings
                 site.Settings = _settings.GetSettings(EntityNames.Site, site.SiteId)
@@ -152,9 +152,16 @@ namespace Oqtane.Controllers
                 return site;
             }
             else
+            {
+                if (site != null)
                 {
                     _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Get Attempt {SiteId}", siteid);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/UrlMappingController.cs

@@ -55,9 +55,16 @@ namespace Oqtane.Controllers
                 return urlMapping;
             }
             else
+            {
+                if (urlMapping != null)
                 {
                     _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized UrlMapping Get Attempt {UrlMappingId}", id);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }
@@ -72,9 +79,16 @@ namespace Oqtane.Controllers
                 return urlMapping;
             }
             else
+            {
+                if (urlMapping != null)
                 {
                     _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized UrlMapping Get Attempt {SiteId} {Url}", siteid, url);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/UserController.cs

@@ -65,6 +65,10 @@ namespace Oqtane.Controllers
                     user.SiteId = int.Parse(siteid);
                     user.Roles = GetUserRoles(user.UserId, user.SiteId);
                 }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return Filter(user);
             }
             else
@@ -88,6 +92,10 @@ namespace Oqtane.Controllers
                     user.SiteId = int.Parse(siteid);
                     user.Roles = GetUserRoles(user.UserId, user.SiteId);
                 }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return Filter(user);
             }
             else

Oqtane.Server/Controllers/UserRoleController.cs

@@ -78,9 +78,16 @@ namespace Oqtane.Controllers
                 return Filter(userrole, _userPermissions.GetUser().UserId);
             }
             else
+            {
+                if (userrole != null)
                 {
                     _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized User Role Get Attempt {UserRoleId}", id);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/VisitorController.cs

@@ -63,9 +63,16 @@ namespace Oqtane.Controllers
                 return visitor;
             }
             else
+            {
+                if (visitor != null)
                 {
                     _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Visitor Get Attempt {VisitorId}", id);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }