refinements

CactuseSecurity · May 16, 2024 · 8b304a3 · 8b304a3
1 parent 276364c
commit 8b304a3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/roles/database/files/sql/creation/fworch-fill-stm.sql b/roles/database/files/sql/creation/fworch-fill-stm.sql
@@ -180,8 +180,7 @@ insert into config (config_key, config_value, config_user) VALUES ('extTicketSys
 									},
 									{
 										"@xsi.type": "date",
-										"name": "Regel befristen bis:",
-										"date": "@@ENDDATE@@"
+										"name": "Regel befristen bis:"
 									},
 									{
 										"@xsi.type": "text_field",
@@ -191,7 +190,7 @@ insert into config (config_key, config_value, config_user) VALUES ('extTicketSys
 									{
 										"@xsi.type": "checkbox",
 										"name": "Die benötigte Kommunikationsverbindung ist im Kommunikationsprofil nach IT-Sicherheitsstandard hinterlegt",
-										"value":  "@@COM_DOCUMENTED@@"
+										"value":  @@COM_DOCUMENTED@@
 									},
 									{
 										"@xsi.type": "drop_down_list",

diff --git a/roles/database/files/upgrade/8.2.2.sql b/roles/database/files/upgrade/8.2.2.sql
@@ -104,8 +104,7 @@ insert into config (config_key, config_value, config_user) VALUES ('extTicketSys
 									},
 									{
 										"@xsi.type": "date",
-										"name": "Regel befristen bis:",
-										"date": "@@ENDDATE@@"
+										"name": "Regel befristen bis:"
 									},
 									{
 										"@xsi.type": "text_field",
@@ -115,7 +114,7 @@ insert into config (config_key, config_value, config_user) VALUES ('extTicketSys
 									{
 										"@xsi.type": "checkbox",
 										"name": "Die benötigte Kommunikationsverbindung ist im Kommunikationsprofil nach IT-Sicherheitsstandard hinterlegt",
-										"value":  "@@COM_DOCUMENTED@@"
+										"value":  @@COM_DOCUMENTED@@
 									},
 									{
 										"@xsi.type": "drop_down_list",

diff --git a/roles/lib/files/FWO.Tufin.SecureChange/ExternalTicket.cs b/roles/lib/files/FWO.Tufin.SecureChange/ExternalTicket.cs
@@ -11,9 +11,7 @@ namespace FWO.Tufin.SecureChange
 	abstract public class ExternalTicket : RequestTicket
 
 	{
-
-		public List<ExternalAccessRequestTicketTask> TicketTasks = new();
-		protected TicketPriority Priority = TicketPriority.Normal;
+		public List<ExternalAccessRequestTicketTask> TicketTasks = [];
 		protected string OnBehalfOfUser = "";
 		// protected string OnBehalfOfUser = """"requester_id": 55,"""";
 
@@ -91,8 +89,7 @@ abstract public class ExternalTicket : RequestTicket
 									},
 									{
 										"@xsi.type": "date",
-										"name": "Regel befristen bis:",
-										"date": "@@ENDDATE@@"
+										"name": "Regel befristen bis:"
 									},
 									{
 										"@xsi.type": "text_field",
@@ -102,7 +99,7 @@ abstract public class ExternalTicket : RequestTicket
 									{
 										"@xsi.type": "checkbox",
 										"name": "Die benötigte Kommunikationsverbindung ist im Kommunikationsprofil nach IT-Sicherheitsstandard hinterlegt",
-										"value":  "@@COM_DOCUMENTED@@"
+										"value":  @@COM_DOCUMENTED@@
 									},
 									{
 										"@xsi.type": "drop_down_list",
@@ -117,7 +114,6 @@ abstract public class ExternalTicket : RequestTicket
 public class SCTicket : ExternalTicket
 {
 	private string Subject { get; set; } = "";
-	private TicketPriority Priority { get; set; } = TicketPriority.Normal;
 	private string OnBehalfUser { get; set; } = "";
 
 	public SCTicket(List<ModellingConnection> connections, string subject, TicketPriority priority = TicketPriority.Normal)
@@ -128,7 +124,7 @@ public SCTicket(List<ModellingConnection> connections, string subject, TicketPri
 			TicketTasks.Add(new ExternalAccessRequestTicketTask(conn));
 		}
 		Subject = subject;
-		Priority = priority;
+		Priority = (int) priority;
 	}
 
 	public void AddTask(ModellingConnection connection)
@@ -138,7 +134,7 @@ public void AddTask(ModellingConnection connection)
 	}
 	private void ConfigureRestClientSerialization(SerializerConfig config)
 	{
-		JsonNetSerializer serializer = new JsonNetSerializer(); // Case insensivitive is enabled by default
+		JsonNetSerializer serializer = new (); // Case insensivitive is enabled by default
 		config.UseSerializer(() => serializer);
 	}
 	public async Task<RestResponse<int>> CreateTicketInTufin(ExternalTicketSystem tufinSystem)

diff --git a/roles/lib/files/FWO.Tufin.SecureChange/ExternalTicketTask.cs b/roles/lib/files/FWO.Tufin.SecureChange/ExternalTicketTask.cs
@@ -8,11 +8,11 @@ public class ExternalAccessRequestTicketTask : RequestReqTask
 		private ModellingConnection Connection = new();
 
 		// mockup:
-		private string Action = "accept";
+		private string Action = "Accept";
 		private string Logging = "Ja";
-
 		private string EndDate = "";
 		// private string AppId = "APP-4711";
+		//private string Reason = "der Grund ..."
 		private string ComDocumented = "false";
 
 		private TicketTaskType TaskType = TicketTaskType.AccessRequest;
@@ -30,7 +30,7 @@ public ExternalAccessRequestTicketTask(ModellingConnection modellingConnection)
 		public string FillTaskTemplate(string tasksTemplate)
 		{			
 			return tasksTemplate
-				.Replace("@@USERS@@", "[]") // data not provided yet
+				.Replace("@@USERS@@", "[\"Any\"]") // data not provided yet
 				.Replace("@@SOURCES@@", ConvertNetworkObjectWrapperssToTufinJsonString(Connection.SourceAppServers, "source"))
 				.Replace("@@DESTINATIONS@@", ConvertNetworkObjectWrapperssToTufinJsonString(Connection.SourceAppServers, "destination"))
 				.Replace("@@SERVICES@@", ConvertNetworkServiceWrapperssToTufinJsonString(Connection.Services))
@@ -42,14 +42,14 @@ public string FillTaskTemplate(string tasksTemplate)
 				.Replace("@@COM_DOCUMENTED@@", ComDocumented);
 		}
 
-		private string ConvertNetworkObjectWrapperssToTufinJsonString(List<ModellingAppServerWrapper> nwObjects, string nwObjField = "source")
+		static private string ConvertNetworkObjectWrapperssToTufinJsonString(List<ModellingAppServerWrapper> nwObjects, string nwObjField = "source")
 		{
 			string result = "[]";
 			// TODO: implement
 			return result;
 		}
 
-		private string ConvertNetworkServiceWrapperssToTufinJsonString(List<ModellingServiceWrapper> services)
+		static private string ConvertNetworkServiceWrapperssToTufinJsonString(List<ModellingServiceWrapper> services)
 		{
 			string result = "[";
 			foreach (ModellingServiceWrapper svc in services)