cleanup

SonarSource · Jul 12, 2023 · 60fb182 · 60fb182
1 parent c3150d7
commit 60fb182
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 25 deletions.
diff --git a/...yzer.Common/SymbolicExecution/Roslyn/RuleChecks/InitializationVectorShouldBeRandomBase.cs b/...yzer.Common/SymbolicExecution/Roslyn/RuleChecks/InitializationVectorShouldBeRandomBase.cs
@@ -50,40 +50,39 @@ protected override ProgramState PreProcessSimple(SymbolicContext context)
         {
             state = ProcessInvocation(invocation, state);
 
-            if (state[invocation.Instance]?.HasConstraint(InitializationVectorConstraint.NotInitialized) is true)
+            if (invocation.Instance is { } inv && state[inv]?.HasConstraint(InitializationVectorConstraint.NotInitialized) is true)
             {
                 ReportIssue(context.Operation.Instance, invocation.Instance.Syntax.ToString());
             }
         }
         return state;
     }
 
-    private ProgramState ProcessAssignment(IAssignmentOperationWrapper assignment, ProgramState state)
+    private static ProgramState ProcessAssignment(IAssignmentOperationWrapper assignment, ProgramState state)
     {
-        var isByteCollectionCreationWithLiterals = assignment.Value.AsArrayCreation() is { } arrayCreation && IsByteCollectionInitializedEmptyOrWithConstants(arrayCreation);
+        var assignmentValueIsCryptographicallyStrong = assignment.Value.AsArrayCreation() is { } arrayCreation && !IsByteCollectionInitializedEmptyOrWithConstants(arrayCreation);
 
-        if (isByteCollectionCreationWithLiterals
-            && assignment.Target.TrackedSymbol() is { } symbol)
+        if (!assignmentValueIsCryptographicallyStrong && assignment.Target.TrackedSymbol() is { } assignmentTargetSymbol)
         {
-            state = state.SetSymbolConstraint(symbol, ByteArrayConstraint.Constant);
+            state = state.SetSymbolConstraint(assignmentTargetSymbol, ByteArrayConstraint.Constant);
         }
-        if (assignment.Target.AsPropertyReference() is { } property
+        if (assignment.Target?.AsPropertyReference() is { } property
             && property.Property.Name.Equals("IV")
-            && (isByteCollectionCreationWithLiterals || state[assignment.Value.TrackedSymbol()].HasConstraint(ByteArrayConstraint.Constant)))
+            && (!assignmentValueIsCryptographicallyStrong || state[assignment.Value.TrackedSymbol()].HasConstraint(ByteArrayConstraint.Constant)))
         {
             state = state.SetSymbolConstraint(property.Instance.TrackedSymbol(), InitializationVectorConstraint.NotInitialized);
         }
 
         return state;
     }
 
-    private ProgramState ProcessInvocation(IInvocationOperationWrapper invocation, ProgramState state)
+    private static ProgramState ProcessInvocation(IInvocationOperationWrapper invocation, ProgramState state)
     {
         if (CryptographicallyStrongRandomNumberGenerators.Any(x => IsStrongRandomGeneratorInvocation(x, invocation))
             && invocation.ArgumentValue("data") is { } byteArray
-            && byteArray.TrackedSymbol() is { } trackedSymbol)
+            && byteArray.TrackedSymbol() is { } byteArraySymbol)
         {
-            state = state.SetSymbolConstraint(trackedSymbol, ByteArrayConstraint.Modified);
+            state = state.SetSymbolConstraint(byteArraySymbol, ByteArrayConstraint.Modified);
         }
         if (IsGenerateIVMethod(invocation))
         {

diff --git a/...nalyzer.UnitTest/TestCases/SymbolicExecution/Roslyn/InitializationVectorShouldBeRandom.cs b/...nalyzer.UnitTest/TestCases/SymbolicExecution/Roslyn/InitializationVectorShouldBeRandom.cs
@@ -17,8 +17,8 @@ public void SymetricAlgorithmCreateEncryptor()
 
                 sa.GenerateKey();
                 var generateIVNotCalled = sa.CreateEncryptor(sa.Key, sa.IV);
-                var constantVector = sa.CreateEncryptor(sa.Key, initializationVectorConstant); // // FIXME Non-compliant  {{Use a dynamically-generated, random IV.}}
-//                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+                var constantVector = sa.CreateEncryptor(sa.Key, initializationVectorConstant); // FIXME Non-compliant  {{Use a dynamically-generated, random IV.}}
+//                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
                 sa.GenerateIV();
                 var defaultConstructor = sa.CreateEncryptor(); // Compliant
@@ -131,18 +131,18 @@ public void CollectionInitializer()
             }
         }
 
-        public void InsideObjectInitializer()
-        {
-            var anonymous = new
-            {
-                IV = new byte[] { 0x00 },
-                Key = new byte[] { 0x00 }
-            };
-            using (AesCryptoServiceProvider aes = new AesCryptoServiceProvider())
-            {
-                ICryptoTransform encryptor = aes.CreateEncryptor(aes.Key, anonymous.IV); // FIXME Non-compliant https://github.com/SonarSource/sonar-dotnet/issues/4555
-            }
-        }
+        //public void InsideObjectInitializer()
+        //{
+        //    var anonymous = new
+        //    {
+        //        IV = new byte[] { 0x00 },
+        //        Key = new byte[] { 0x00 }
+        //    };
+        //    using (AesCryptoServiceProvider aes = new AesCryptoServiceProvider())
+        //    {
+        //        ICryptoTransform encryptor = aes.CreateEncryptor(aes.Key, anonymous.IV); // FIXME Non-compliant https://github.com/SonarSource/sonar-dotnet/issues/4555
+        //    }
+        //}
 
         public void DifferentCases()
         {