Add Environ () emulator

Add Shell() interceptor Add CreateObject() interceptor
airbus-cert · Aug 7, 2024 · 90a3928 · 90a3928
1 parent e968fd8
commit 90a3928
Show file tree

Hide file tree

Showing 81 changed files with 35,994 additions and 75 deletions.
diff --git a/Resources/samples/sample_11.txt b/Resources/samples/sample_11.txt
diff --git a/Sources/vbSparkle.Console/Properties/launchSettings.json b/Sources/vbSparkle.Console/Properties/launchSettings.json
@@ -6,7 +6,7 @@
     },
     "Sample_7": {
       "commandName": "Project",
-      "commandLineArgs": "-p $(SolutionDir)\\Resources\\samples\\sample_7.txt"
+      "commandLineArgs": "-p $(SolutionDir)\\Resources\\samples\\sample_11.txt"
     },
     "Sample_10": {
       "commandName": "Project",

diff --git a/Sources/vbSparkle.Console/vbSparkle.CLI.csproj b/Sources/vbSparkle.Console/vbSparkle.CLI.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <StartupObject>vbSparkle.CLI.Program</StartupObject>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <Authors>Sylvain Bruyere, Airbus CERT</Authors>

diff --git a/Sources/vbSparkle/LanguageStatements/Blocks/VbCaseStatement.cs b/Sources/vbSparkle/LanguageStatements/Blocks/VbCaseStatement.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Blocks/VbCondExpStatement.cs b/Sources/vbSparkle/LanguageStatements/Blocks/VbCondExpStatement.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Blocks/VbDoLoopStatement.cs b/Sources/vbSparkle/LanguageStatements/Blocks/VbDoLoopStatement.cs
@@ -1,5 +1,5 @@
 using System.Text;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Blocks/VbForEachStatement.cs b/Sources/vbSparkle/LanguageStatements/Blocks/VbForEachStatement.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 using System.Text;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Blocks/VbForNextStatement.cs b/Sources/vbSparkle/LanguageStatements/Blocks/VbForNextStatement.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Blocks/VbIfBlockStmtContext.cs b/Sources/vbSparkle/LanguageStatements/Blocks/VbIfBlockStmtContext.cs
@@ -1,6 +1,6 @@
 using System.Text;
 using vbSparkle.NativeMethods;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Blocks/VbIfConditionStmtContext.cs b/Sources/vbSparkle/LanguageStatements/Blocks/VbIfConditionStmtContext.cs
@@ -1,6 +1,6 @@
 using vbSparkle.EvaluationObjects;
 using vbSparkle.NativeMethods;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Blocks/VbIfElseBlockStmtContext.cs b/Sources/vbSparkle/LanguageStatements/Blocks/VbIfElseBlockStmtContext.cs
@@ -1,5 +1,5 @@
 using System.Text;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Blocks/VbIfElseIfBlockStmtContext.cs b/Sources/vbSparkle/LanguageStatements/Blocks/VbIfElseIfBlockStmtContext.cs
@@ -1,5 +1,5 @@
 using System.Text;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Blocks/VbIfThenElseStatement.cs b/Sources/vbSparkle/LanguageStatements/Blocks/VbIfThenElseStatement.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text;
 using vbSparkle.Options;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Blocks/VbInlineIfBlockStmtContext.cs b/Sources/vbSparkle/LanguageStatements/Blocks/VbInlineIfBlockStmtContext.cs
@@ -1,5 +1,5 @@
 using System.Text;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Blocks/VbInlineIfElseBlockStmtContext.cs b/Sources/vbSparkle/LanguageStatements/Blocks/VbInlineIfElseBlockStmtContext.cs
@@ -1,5 +1,5 @@
 using System.Text;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Blocks/VbInlineIfThenElseStatement.cs b/Sources/vbSparkle/LanguageStatements/Blocks/VbInlineIfThenElseStatement.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Text;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Blocks/VbSelectCaseStatement.cs b/Sources/vbSparkle/LanguageStatements/Blocks/VbSelectCaseStatement.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Blocks/VbWhileStatement.cs b/Sources/vbSparkle/LanguageStatements/Blocks/VbWhileStatement.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Text;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Blocks/VbWithStatement.cs b/Sources/vbSparkle/LanguageStatements/Blocks/VbWithStatement.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 using System.Text;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Functions/VBMethod.cs b/Sources/vbSparkle/LanguageStatements/Functions/VBMethod.cs
@@ -1,4 +1,5 @@
-using System;
+using MathNet.Symbolics;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -112,6 +113,107 @@ public override DExpression Evaluate(params DExpression[] args)
             return new DSimpleStringExpression(str, Encoding.Unicode, Context.Options);
         }
     }
+    public class VB_EnvironS : VbNativeFunction
+    {
+        public VB_EnvironS(IVBScopeObject context)
+            : base(context, "Environ$")
+        {
+        }
+
+        public override DExpression Evaluate(params DExpression[] args)
+        {
+            DExpression arg1 = args.FirstOrDefault();
+
+            string strArg;
+
+            if (!Converter.TryGetStringValue(arg1, out strArg))
+            {
+                return DefaultExpression(args);
+            }
+
+            return new DSimpleStringExpression($"%{strArg}%", Encoding.Unicode, Context.Options);
+        }
+    }
+
+    public class VB_Environ
+    : VbNativeFunction
+    {
+        public VB_Environ(IVBScopeObject context)
+            : base(context, "Environ")
+        {
+        }
+
+        public override DExpression Evaluate(params DExpression[] args)
+        {
+            DExpression arg1 = args.FirstOrDefault();
+
+            string strArg;
+
+            if (!Converter.TryGetStringValue(arg1, out strArg))
+            {
+                return DefaultExpression(args);
+            }
+
+            return new DSimpleStringExpression($"%{strArg}%", Encoding.Unicode, Context.Options);
+        }
+    }
+
+
+    public class VB_CreateObject
+    : VbNativeFunction
+    {
+        public VB_CreateObject(IVBScopeObject context)
+            : base(context, "CreateObject")
+        {
+        }
+
+        public override DExpression Evaluate(params DExpression[] args)
+        {
+            DExpression arg1 = args.FirstOrDefault();
+
+            string strArg;
+
+            if (!Converter.TryGetStringValue(arg1, out strArg))
+            {
+                return DefaultExpression(args);
+            }
+
+            if (Context?.Options?.CreateObjectObserver != null)
+            {
+                Context.Options.CreateObjectObserver.CreateObjectObserved.Add(strArg.Replace("\"\"", "\""));
+            }
+
+            return DefaultExpression(args);
+        }
+    }
+
+    public class VB_Shell
+    : VbNativeFunction
+    {
+        public VB_Shell(IVBScopeObject context)
+            : base(context, "Shell")
+        {
+        }
+
+        public override DExpression Evaluate(params DExpression[] args)
+        {
+            DExpression arg1 = args.FirstOrDefault();
+
+            string strArg;
+
+            if (!Converter.TryGetStringValue(arg1, out strArg))
+            {
+                return DefaultExpression(args);
+            }
+
+            if (Context?.Options?.ShellObserver != null)
+            {
+                Context.Options.ShellObserver.ShellObserved.Add(strArg.Replace("\"\"", "\""));
+            }
+
+            return DefaultExpression(args);
+        }
+    }
 
     public class VB_Execute
     : VbNativeFunction

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/LiteralContext.cs b/Sources/vbSparkle/LanguageStatements/Literals/LiteralContext.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-
-namespace vbSparkle
-{
+using vbSparkle;
+//namespace vbSparkle
+//{
     public partial class VBScriptParser
     {
         public partial class LiteralContext : ILiteralContext
@@ -16,4 +16,4 @@ public partial class DelimitedLiteralContext : ILiteralContext
 
         }
     }
-}
+//}
diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtBoolean.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtBoolean.cs
@@ -1,6 +1,6 @@
 using System;
 using vbSparkle.EvaluationObjects;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtColor.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtColor.cs
@@ -1,5 +1,5 @@
 using System;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtDateTime.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtDateTime.cs
@@ -1,6 +1,6 @@
 using System;
 using vbSparkle.EvaluationObjects;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtDouble.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtDouble.cs
@@ -1,4 +1,4 @@
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtFileNumber.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtFileNumber.cs
@@ -1,5 +1,5 @@
 using System;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtInteger.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtInteger.cs
@@ -1,5 +1,5 @@
 using System;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtNothing.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtNothing.cs
@@ -1,4 +1,4 @@
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtNull.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtNull.cs
@@ -1,4 +1,4 @@
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtOctal.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtOctal.cs
@@ -1,5 +1,5 @@
 using System;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtString.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtString.cs
@@ -1,6 +1,6 @@
 using System.Text;
 using vbSparkle.EvaluationObjects;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/ValueStatements/VBValueStatement.cs b/Sources/vbSparkle/LanguageStatements/ValueStatements/VBValueStatement.cs
@@ -1,5 +1,5 @@
 using System;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/ValueStatements/VBVsAddressOfContext.cs b/Sources/vbSparkle/LanguageStatements/ValueStatements/VBVsAddressOfContext.cs
@@ -1,4 +1,4 @@
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/ValueStatements/VBVsAssignContext.cs b/Sources/vbSparkle/LanguageStatements/ValueStatements/VBVsAssignContext.cs
@@ -1,4 +1,4 @@
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/ValueStatements/VBVsDualOperation.cs b/Sources/vbSparkle/LanguageStatements/ValueStatements/VBVsDualOperation.cs
@@ -1,4 +1,4 @@
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/ValueStatements/VBVsICSContext.cs b/Sources/vbSparkle/LanguageStatements/ValueStatements/VBVsICSContext.cs
@@ -1,4 +1,4 @@
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/ValueStatements/VBVsLiteralContext.cs b/Sources/vbSparkle/LanguageStatements/ValueStatements/VBVsLiteralContext.cs
@@ -1,4 +1,4 @@
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/ValueStatements/VBVsNewContext.cs b/Sources/vbSparkle/LanguageStatements/ValueStatements/VBVsNewContext.cs
@@ -1,4 +1,4 @@
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {

diff --git a/Sources/vbSparkle/LanguageStatements/ValueStatements/VBVsStructContext.cs b/Sources/vbSparkle/LanguageStatements/ValueStatements/VBVsStructContext.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using static vbSparkle.VBScriptParser;
+using static VBScriptParser;
 
 namespace vbSparkle
 {