Validate TimeZoneId

Author: ethanhann

IntegrationEngine/Api/Controllers/CronTriggerController.cs

@@ -48,6 +48,8 @@ public IHttpActionResult PutCronTrigger(string id, CronTrigger trigger)
                 return BadRequest("Job type is invalid: " + trigger.JobType);
             if (!trigger.CronExpressionString.IsValidCronExpression())
                 return BadRequest("Cron expression is not valid: " + trigger.CronExpressionString);
+            if (!trigger.TimeZoneId.IsValidTimeZone())
+                return BadRequest("Time zone id is invalid: " + trigger.TimeZoneId);
             Repository.Update(trigger);
             EngineScheduler.ScheduleJobWithCronTrigger(trigger);
             return StatusCode(HttpStatusCode.NoContent);
@@ -61,6 +63,8 @@ public IHttpActionResult PostCronTrigger(CronTrigger trigger)
                 return BadRequest("Job type is invalid: " + trigger.JobType);
             if (!trigger.CronExpressionString.IsValidCronExpression())
                 return BadRequest("Cron expression is not valid: " + trigger.CronExpressionString);
+            if (!trigger.TimeZoneId.IsValidTimeZone())
+                return BadRequest("Time zone id is invalid: " + trigger.TimeZoneId);
             var triggerWithId = Repository.Insert(trigger);
             EngineScheduler.ScheduleJobWithCronTrigger(triggerWithId);
             return CreatedAtRoute("DefaultApi", new { id = triggerWithId.Id }, triggerWithId);

IntegrationEngine/IntegrationEngine.csproj

@@ -53,10 +53,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Common.Logging, Version=3.0.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Common.Logging.3.0.0\lib\net40\Common.Logging.dll</HintPath>
-    </Reference>
     <Reference Include="Common.Logging.Core">
       <HintPath>..\packages\Common.Logging.Core.3.0.0\lib\net40\Common.Logging.Core.dll</HintPath>
     </Reference>
@@ -78,21 +74,9 @@
     <Reference Include="Microsoft.Owin.Hosting">
       <HintPath>..\packages\Microsoft.Owin.Hosting.3.0.0\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="NLog">
       <HintPath>..\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath>
     </Reference>
-    <Reference Include="Quartz, Version=2.3.1.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Quartz.2.3.1\lib\net40\Quartz.dll</HintPath>
-    </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.4.3.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RabbitMQ.Client.3.4.3\lib\net35\RabbitMQ.Client.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="Elasticsearch.Net">
       <HintPath>..\packages\Elasticsearch.Net.1.3.1\lib\Elasticsearch.Net.dll</HintPath>
@@ -140,6 +124,18 @@
     <Reference Include="Microsoft.Practices.Unity.RegistrationByConvention">
       <HintPath>..\packages\Unity.3.5.1404.0\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
     </Reference>
+    <Reference Include="Common.Logging">
+      <HintPath>..\packages\Common.Logging.3.0.0\lib\net40\Common.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Quartz">
+      <HintPath>..\packages\Quartz.2.3.1\lib\net40\Quartz.dll</HintPath>
+    </Reference>
+    <Reference Include="RabbitMQ.Client">
+      <HintPath>..\packages\RabbitMQ.Client.3.4.3\lib\net35\RabbitMQ.Client.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\configuration\SharedAssemblyInfo.cs">
@@ -175,8 +171,7 @@
     <Compile Include="Scheduler\ITimeZone.cs" />
     <Compile Include="Scheduler\SimpleTrigger.cs" />
     <Compile Include="Scheduler\TimeZone.cs" />
-    <Compile Include="Scheduler\TriggerCronExpressionExtension.cs" />
-    <Compile Include="Scheduler\TriggerStateIdExtension.cs" />
+    <Compile Include="Scheduler\TriggerPropertyExtension.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>

IntegrationEngine/Scheduler/TriggerCronExpressionExtension.cs

@@ -0,0 +1,30 @@
+using System;
+
+namespace IntegrationEngine.Scheduler
+{
+    public static class TriggerPropertyExtension
+    {
+        public static bool IsValidCronExpression(this string value)
+        {
+            return Quartz.CronExpression.IsValidExpression(value);
+        }
+
+        public static bool IsValidTimeZone(this string value)
+        {
+            try
+            {
+                TimeZoneInfo.FindSystemTimeZoneById(value);
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        public static string GetStateDescription(this int value)
+        {
+            return ((Quartz.TriggerState)value).ToString();
+        }
+    }
+}