[mapguide-commits] r10040 - trunk/MgDev/Web/src/HttpHandler

[svn_mapguide at osgeo.org]

Author: jng
Date: 2023-03-30 01:07:39 -0700 (Thu, 30 Mar 2023)
New Revision: 10040

Modified:
   trunk/MgDev/Web/src/HttpHandler/HttpGetResourceContent.cpp
   trunk/MgDev/Web/src/HttpHandler/HttpGetResourceData.cpp
   trunk/MgDev/Web/src/HttpHandler/HttpGetResourceHeader.cpp
   trunk/MgDev/Web/src/HttpHandler/HttpResult.cpp
Log:
Use the exception code as the http status message and fix MgPermissionDenied exceptions being thrown with no arguments

Fixes #2866

Modified: trunk/MgDev/Web/src/HttpHandler/HttpGetResourceContent.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/HttpGetResourceContent.cpp	2023-03-28 14:50:37 UTC (rev 10039)
+++ trunk/MgDev/Web/src/HttpHandler/HttpGetResourceContent.cpp	2023-03-30 08:07:39 UTC (rev 10040)
@@ -72,9 +72,11 @@
         auto anonCheck = MgHttpAnonymousCheck::GetInstance();
         if (anonCheck->ShouldDenyGetResourceContent(&resource))
         {
+            MgStringCollection arguments;
+            arguments.Add(m_resourceId);
             throw new MgException(MgExceptionCodes::MgPermissionDeniedException,
                 L"MgHttpGetResourceContent.Execute",
-                __LINE__, __WFILE__, NULL, L"", NULL);
+                __LINE__, __WFILE__, &arguments, L"", NULL);
         }
     }
 

Modified: trunk/MgDev/Web/src/HttpHandler/HttpGetResourceData.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/HttpGetResourceData.cpp	2023-03-28 14:50:37 UTC (rev 10039)
+++ trunk/MgDev/Web/src/HttpHandler/HttpGetResourceData.cpp	2023-03-30 08:07:39 UTC (rev 10040)
@@ -74,9 +74,11 @@
         auto anonCheck = MgHttpAnonymousCheck::GetInstance();
         if (anonCheck->ShouldDenyGetResourceData(&mgrIdentifier))
         {
+            MgStringCollection arguments;
+            arguments.Add(m_resourceId);
             throw new MgException(MgExceptionCodes::MgPermissionDeniedException,
                 L"MgHttpGetResourceContent.Execute",
-                __LINE__, __WFILE__, NULL, L"", NULL);
+                __LINE__, __WFILE__, &arguments, L"", NULL);
         }
     }
 

Modified: trunk/MgDev/Web/src/HttpHandler/HttpGetResourceHeader.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/HttpGetResourceHeader.cpp	2023-03-28 14:50:37 UTC (rev 10039)
+++ trunk/MgDev/Web/src/HttpHandler/HttpGetResourceHeader.cpp	2023-03-30 08:07:39 UTC (rev 10040)
@@ -72,9 +72,11 @@
         auto anonCheck = MgHttpAnonymousCheck::GetInstance();
         if (anonCheck->ShouldDenyGetResourceHeader(&mgrIdentifier))
         {
+            MgStringCollection arguments;
+            arguments.Add(m_resourceId);
             throw new MgException(MgExceptionCodes::MgPermissionDeniedException,
                 L"MgHttpGetResourceContent.Execute",
-                __LINE__, __WFILE__, NULL, L"", NULL);
+                __LINE__, __WFILE__, &arguments, L"", NULL);
         }
     }
 

Modified: trunk/MgDev/Web/src/HttpHandler/HttpResult.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/HttpResult.cpp	2023-03-28 14:50:37 UTC (rev 10039)
+++ trunk/MgDev/Web/src/HttpHandler/HttpResult.cpp	2023-03-30 08:07:39 UTC (rev 10040)
@@ -207,7 +207,7 @@
     {
         // Map Mg exception to HTTP result.
 
-        httpStatusMessage = mgException->GetClassName();
+        httpStatusMessage = mgException->GetExceptionCode();
         errorMessage = mgException->GetExceptionMessage();
         detailedMessage = mgException->GetDetails();