From 30857e5af12bc1eb9b0a7d320017b7148122c669 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Fri, 5 Jan 2024 12:04:21 -0800
Subject: [PATCH 1/4] Making error emails come from my email address so that SD
 rules are applied. Attempts to filter duplicates.

---
 web/Controllers/HomeController.cs |  7 +++
 web/nlog.config                   | 73 ++++++++++++++++---------------
 2 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/web/Controllers/HomeController.cs b/web/Controllers/HomeController.cs
index e1a3840..a10530f 100644
--- a/web/Controllers/HomeController.cs
+++ b/web/Controllers/HomeController.cs
@@ -201,6 +201,13 @@ public IActionResult Error()
             return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
         }
 
+        [Route("/[action]")]
+        [SearchExclude]
+        public IActionResult CauseError()
+        {
+            throw new Exception("I am an exception.");
+        }
+
         /// <summary>
         /// StatusCode or 403 page. Example path: /Error/404
         /// </summary>
diff --git a/web/nlog.config b/web/nlog.config
index 43d03f1..c739c19 100644
--- a/web/nlog.config
+++ b/web/nlog.config
@@ -33,41 +33,42 @@
     <target xsi:type="File" name="smtpSentLog" fileName="${logDirectory}\Email\viperlog-${shortdate}.log"
 						header="Date Time|Level|Logger|Subject|To|Message"
 						layout="${longdate}|${uppercase:${level}}|${event-properties:item=CallingMethod}|${event-properties:item=Subject}|${event-properties:item=To}|${message}" />
-
-    <target xsi:type="Mail"
-            name="warningErrorEmail"
-            smtpServer="ucdavis-edu.mail.protection.outlook.com"
-						smtpPort="25"
-						smtpAuthentication="None"
-						enableSsl="true"
-            html="true"
-            addNewLines="true"
-            replaceNewlineWithBrTagInHtml="true"
-            subject="@SDP@ VIPER Error: ${aspnet-Request-Url}: ${machinename} ${date}"
-            to="svmithelp@ucdavis.edu"
-            from="svmithelp@ucdavis.edu" 
-            body="&lt;b&gt;User Info:&lt;/b&gt;${newline}
-                  Severity: ${uppercase:${level}}${newline}
-                  User Identity: ${aspnet-User-Identity} ${newline}
-                  Client IP: ${aspnet-Request-IP}${newline}
-									Method: ${aspnet-Request-Method}${newline}
-                  Url: ${aspnet-Request-Url}${newline}
-									QueryString: ${aspnet-Request-QueryString}${newline}
-                  Referrer: ${aspnet-Request-Referrer}${newline}
-                  UserAgent: ${aspnet-Request-UserAgent}${newline}${newline}
-                  &lt;b&gt;Exception:&lt;/b&gt;${newline}
-                  Message: ${message}${newline}
-                  Source: ${logger}${newline}
-                  Stack: ${exception:format=tostring,Data:maxInnerExceptionLevel=10}
-                  
-                  @@SITE=SVM@@
-                  @@CATEGORY=Web Apps@@
-                  @@SUBCATEGORY=VIPER@@
-                  @@STATUS=In Progress@@
-                  @@GROUP=Administrative Applications@@
-                  @@REQUESTER=VIPER AUTOSUBMIT@@
-                  @@TECHNICIANEMAIL=bsedwards@ucdavis.edu@@"
-      />
+    <target xsi:type="FilteringWrapper" name="filterRepeatErrorEmails">
+		<target xsi:type="Mail"
+				name="warningErrorEmail"
+				smtpServer="ucdavis-edu.mail.protection.outlook.com"
+							smtpPort="25"
+							smtpAuthentication="None"
+							enableSsl="true"
+				html="true"
+				addNewLines="true"
+				replaceNewlineWithBrTagInHtml="true"
+				subject="@SDP@ VIPER Error: ${aspnet-Request-Url}: ${machinename} ${date}"
+				to="svmithelp@ucdavis.edu"
+				from="bsedwards@ucdavis.edu"
+				body="&lt;b&gt;User Info:&lt;/b&gt;${newline}
+                    Severity: ${uppercase:${level}}${newline}
+                    User Identity: ${aspnet-User-Identity} ${newline}
+                    Client IP: ${aspnet-Request-IP}${newline}
+                    Method: ${aspnet-Request-Method}${newline}
+                    Url: ${aspnet-Request-Url}${newline}
+                    QueryString: ${aspnet-Request-QueryString}${newline}
+                    Referrer: ${aspnet-Request-Referrer}${newline}
+                    UserAgent: ${aspnet-Request-UserAgent}${newline}${newline}
+                    &lt;b&gt;Exception:&lt;/b&gt;${newline}
+                    Message: ${message}${newline}
+                    Source: ${logger}${newline}
+                    Stack: ${exception:format=tostring,Data:maxInnerExceptionLevel=10}
+                    @@SITE=SVM@@
+                    @@CATEGORY=Web Apps@@
+                    @@SUBCATEGORY=VIPER@@
+                    @@STATUS=In Progress@@
+                    @@GROUP=Administrative Applications@@
+                    @@REQUESTER=VIPER AUTOSUBMIT@@
+                    @@TECHNICIANEMAIL=bsedwards@ucdavis.edu@@"
+          />
+          <filter type="whenRepeated" layout="${exception:format=Type}" timeoutSeconds="600" action="Ignore" />
+    </target>
 
     <!--Console Target for hosting lifetime messages to improve Docker / Visual Studio startup detection -->
     <target xsi:type="Console" name="lifetimeConsole" layout="${MicrosoftConsoleLayout}" />  
@@ -103,7 +104,7 @@
     <logger name="*" minlevel="Error" writeTo="warningErrorEmail">
       <filters defaultAction='Log'>
         <when condition="contains('${currentEnviroment}','Development')" action="Ignore" />
-        <when condition="contains('${currentEnviroment}','Test')" action="Ignore" />
+        <when condition="contains('${currentEnviroment}','Test')" action="Log" />
       </filters>
     </logger>
     

From eab3f44fb6947a26ab522cc904cb097822bd6a35 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Fri, 5 Jan 2024 12:25:18 -0800
Subject: [PATCH 2/4] Trying custom layout

---
 web/nlog.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/nlog.config b/web/nlog.config
index c739c19..c94f852 100644
--- a/web/nlog.config
+++ b/web/nlog.config
@@ -67,7 +67,7 @@
                     @@REQUESTER=VIPER AUTOSUBMIT@@
                     @@TECHNICIANEMAIL=bsedwards@ucdavis.edu@@"
           />
-          <filter type="whenRepeated" layout="${exception:format=Type}" timeoutSeconds="600" action="Ignore" />
+          <filter type="whenRepeated" layout="${aspnet-User-Identity}|${message}" timeoutSeconds="600" action="Ignore" />
     </target>
 
     <!--Console Target for hosting lifetime messages to improve Docker / Visual Studio startup detection -->

From 1fecdc9eb327b2c6b8ea4d3cb1a5b339ec1a15b8 Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Fri, 5 Jan 2024 12:32:20 -0800
Subject: [PATCH 3/4] Moving whenRepeated to logger definition

---
 web/nlog.config | 71 +++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 37 deletions(-)

diff --git a/web/nlog.config b/web/nlog.config
index c94f852..ae468c4 100644
--- a/web/nlog.config
+++ b/web/nlog.config
@@ -33,42 +33,39 @@
     <target xsi:type="File" name="smtpSentLog" fileName="${logDirectory}\Email\viperlog-${shortdate}.log"
 						header="Date Time|Level|Logger|Subject|To|Message"
 						layout="${longdate}|${uppercase:${level}}|${event-properties:item=CallingMethod}|${event-properties:item=Subject}|${event-properties:item=To}|${message}" />
-    <target xsi:type="FilteringWrapper" name="filterRepeatErrorEmails">
-		<target xsi:type="Mail"
-				name="warningErrorEmail"
-				smtpServer="ucdavis-edu.mail.protection.outlook.com"
-							smtpPort="25"
-							smtpAuthentication="None"
-							enableSsl="true"
-				html="true"
-				addNewLines="true"
-				replaceNewlineWithBrTagInHtml="true"
-				subject="@SDP@ VIPER Error: ${aspnet-Request-Url}: ${machinename} ${date}"
-				to="svmithelp@ucdavis.edu"
-				from="bsedwards@ucdavis.edu"
-				body="&lt;b&gt;User Info:&lt;/b&gt;${newline}
-                    Severity: ${uppercase:${level}}${newline}
-                    User Identity: ${aspnet-User-Identity} ${newline}
-                    Client IP: ${aspnet-Request-IP}${newline}
-                    Method: ${aspnet-Request-Method}${newline}
-                    Url: ${aspnet-Request-Url}${newline}
-                    QueryString: ${aspnet-Request-QueryString}${newline}
-                    Referrer: ${aspnet-Request-Referrer}${newline}
-                    UserAgent: ${aspnet-Request-UserAgent}${newline}${newline}
-                    &lt;b&gt;Exception:&lt;/b&gt;${newline}
-                    Message: ${message}${newline}
-                    Source: ${logger}${newline}
-                    Stack: ${exception:format=tostring,Data:maxInnerExceptionLevel=10}
-                    @@SITE=SVM@@
-                    @@CATEGORY=Web Apps@@
-                    @@SUBCATEGORY=VIPER@@
-                    @@STATUS=In Progress@@
-                    @@GROUP=Administrative Applications@@
-                    @@REQUESTER=VIPER AUTOSUBMIT@@
-                    @@TECHNICIANEMAIL=bsedwards@ucdavis.edu@@"
-          />
-          <filter type="whenRepeated" layout="${aspnet-User-Identity}|${message}" timeoutSeconds="600" action="Ignore" />
-    </target>
+	<target xsi:type="Mail"
+			name="warningErrorEmail"
+			smtpServer="ucdavis-edu.mail.protection.outlook.com"
+						smtpPort="25"
+						smtpAuthentication="None"
+						enableSsl="true"
+			html="true"
+			addNewLines="true"
+			replaceNewlineWithBrTagInHtml="true"
+			subject="@SDP@ VIPER Error: ${aspnet-Request-Url}: ${machinename} ${date}"
+			to="svmithelp@ucdavis.edu"
+			from="bsedwards@ucdavis.edu"
+			body="&lt;b&gt;User Info:&lt;/b&gt;${newline}
+                Severity: ${uppercase:${level}}${newline}
+                User Identity: ${aspnet-User-Identity} ${newline}
+                Client IP: ${aspnet-Request-IP}${newline}
+                Method: ${aspnet-Request-Method}${newline}
+                Url: ${aspnet-Request-Url}${newline}
+                QueryString: ${aspnet-Request-QueryString}${newline}
+                Referrer: ${aspnet-Request-Referrer}${newline}
+                UserAgent: ${aspnet-Request-UserAgent}${newline}${newline}
+                &lt;b&gt;Exception:&lt;/b&gt;${newline}
+                Message: ${message}${newline}
+                Source: ${logger}${newline}
+                Stack: ${exception:format=tostring,Data:maxInnerExceptionLevel=10}
+                @@SITE=SVM@@
+                @@CATEGORY=Web Apps@@
+                @@SUBCATEGORY=VIPER@@
+                @@STATUS=In Progress@@
+                @@GROUP=Administrative Applications@@
+                @@REQUESTER=VIPER AUTOSUBMIT@@
+                @@TECHNICIANEMAIL=bsedwards@ucdavis.edu@@"
+        />
 
     <!--Console Target for hosting lifetime messages to improve Docker / Visual Studio startup detection -->
     <target xsi:type="Console" name="lifetimeConsole" layout="${MicrosoftConsoleLayout}" />  
@@ -104,7 +101,7 @@
     <logger name="*" minlevel="Error" writeTo="warningErrorEmail">
       <filters defaultAction='Log'>
         <when condition="contains('${currentEnviroment}','Development')" action="Ignore" />
-        <when condition="contains('${currentEnviroment}','Test')" action="Log" />
+        <whenRepeated layout="${aspnet-User-Identity}|${message}" timeoutSeconds="600" action="Ignore" />
       </filters>
     </logger>
     

From 72a8d08eae7e677f1258939da7fd7da5ff829afb Mon Sep 17 00:00:00 2001
From: Brandon <bsedwards@ucdavis.edu>
Date: Fri, 5 Jan 2024 12:57:46 -0800
Subject: [PATCH 4/4] Removing testing changes

---
 web/Controllers/HomeController.cs | 7 -------
 web/nlog.config                   | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/web/Controllers/HomeController.cs b/web/Controllers/HomeController.cs
index a10530f..e1a3840 100644
--- a/web/Controllers/HomeController.cs
+++ b/web/Controllers/HomeController.cs
@@ -201,13 +201,6 @@ public IActionResult Error()
             return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
         }
 
-        [Route("/[action]")]
-        [SearchExclude]
-        public IActionResult CauseError()
-        {
-            throw new Exception("I am an exception.");
-        }
-
         /// <summary>
         /// StatusCode or 403 page. Example path: /Error/404
         /// </summary>
diff --git a/web/nlog.config b/web/nlog.config
index ae468c4..8c7d23d 100644
--- a/web/nlog.config
+++ b/web/nlog.config
@@ -101,6 +101,7 @@
     <logger name="*" minlevel="Error" writeTo="warningErrorEmail">
       <filters defaultAction='Log'>
         <when condition="contains('${currentEnviroment}','Development')" action="Ignore" />
+		  <when condition="contains('${currentEnviroment}','Test')" action="Ignore" />
         <whenRepeated layout="${aspnet-User-Identity}|${message}" timeoutSeconds="600" action="Ignore" />
       </filters>
     </logger>