fix: Restore Malware Scanner workflow and add separate build-and-snyk workflow

Author: aniket-okta

.circleci/config.yaml

@@ -5,101 +5,69 @@ orbs:
   aws-cli: circleci/aws-cli@5.1
   general-platform-helpers: okta/general-platform-helpers@1.9
 
-jobs:
-  build:
+executors:
+  dotnet-executor:
     docker:
       - image: mcr.microsoft.com/dotnet/sdk:6.0
+
+jobs:
+  build:
+    executor: dotnet-executor
     steps:
+      - checkout
+      - run:
+          name: Check dotnet version
+          command: dotnet --version
       - run:
-          name: Manual HTTPS checkout (avoid SSH)
+          name: Clone https version (since git ssh may not be available)
           command: |
-            git --version
-            rm -rf .git || true
-            git init .
-            git remote add origin https://github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git
-            git fetch --depth=1 origin $CIRCLE_SHA1
-            git checkout --force $CIRCLE_SHA1
-
-      - run: dotnet --version
-
-      - run: 
-          name: get packages to scan
+            rm -rf .git
+            git init
+            git remote add origin https://github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}.git
+            git fetch origin
+            git checkout -b ${CIRCLE_BRANCH} origin/${CIRCLE_BRANCH}
+      - run:
+          name: Restore dependencies
           command: |
-            nuget restore ./Okta.Xamarin/Okta.Xamarin/Okta.Xamarin.csproj &&
-            nuget restore ./Okta.Xamarin/Okta.Xamarin.iOS/Okta.Xamarin.iOS.csproj &&
-            nuget restore ./Okta.Xamarin/Okta.Xamarin.Android/Okta.Xamarin.Android.csproj &&
-            nuget restore ./Okta.Xamarin/Tests/Okta.Xamarin.Test/Okta.Xamarin.Test.csproj
-
+            dotnet restore ./Okta.Xamarin/Okta.Xamarin/Okta.Xamarin.csproj
+            dotnet restore ./Okta.Xamarin/Okta.Xamarin.iOS/Okta.Xamarin.iOS.csproj  
+            dotnet restore ./Okta.Xamarin/Okta.Xamarin.Android/Okta.Xamarin.Android.csproj
+            dotnet restore ./Okta.Xamarin/Tests/Okta.Xamarin.Test/Okta.Xamarin.Test.csproj
       - run:
-          name: build Binary to scan
+          name: Build solution
           command: dotnet build ./Okta.Xamarin/Okta.Xamarin.sln
-
       - persist_to_workspace:
           root: .
           paths:
-            - .
+            - "*"
 
   reversing-labs:
-    docker:
-      - image: mcr.microsoft.com/dotnet/sdk:6.0
+    executor: dotnet-executor
     steps:
+      - attach_workspace:
+          at: .
       - run:
-          name: Manual HTTPS checkout (avoid SSH)
-          command: |
-            git --version
-            rm -rf .git || true
-            git init .
-            git remote add origin https://github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git
-            git fetch --depth=1 origin $CIRCLE_SHA1
-            git checkout --force $CIRCLE_SHA1
-
-      - run: dotnet --version
-
-      - run: 
-          name: get packages to scan
-          command: |
-            nuget restore ./Okta.Xamarin/Okta.Xamarin/Okta.Xamarin.csproj &&
-            nuget restore ./Okta.Xamarin/Okta.Xamarin.iOS/Okta.Xamarin.iOS.csproj &&
-            nuget restore ./Okta.Xamarin/Okta.Xamarin.Android/Okta.Xamarin.Android.csproj &&
-            nuget restore ./Okta.Xamarin/Tests/Okta.Xamarin.Test/Okta.Xamarin.Test.csproj
-
-      - run:
-          name: build Binary to scan
-          command: dotnet build ./Okta.Xamarin/Okta.Xamarin.sln
-       
-      # Necessary to Install rl wrapper   
-      - run:
-          name: Install Python
+          name: Install Python and dependencies
           command: |
             apt-get update
             apt-get install -y curl python3 python3-pip unzip
             pip3 install --upgrade pip
-  
-      # Download the scanner from Okta Security
       - run:
           name: Download Reverse Labs Scanner
           command: |
             curl https://dso-resources.oktasecurity.com/scanner \
               -H "x-api-key: $DSO_RLSECURE_TOKEN" \
               --output rl_wrapper-0.0.2+35ababa-py3-none-any.whl
-
-      # Install the wrapper that was downloaded
       - run:
           name: Install RL Wrapper
           command: |
             pip3 install ./rl_wrapper-0.0.2+35ababa-py3-none-any.whl
-  
-      # Setup the AWS profile
       - aws-cli/setup:
           profile_name: default
           role_arn: $AWS_ARN
           region: us-east-1
-  
-      # Get the credentials and save to env
       - run: >-
           eval "$(aws configure export-credentials --profile default --format env)" 2> /dev/null
-  
-      # Run the wrapper, do not change anything here
       - run:
           name: Run Reversing Labs Wrapper Scanner
           command: |
@@ -113,30 +81,35 @@ jobs:
               --suppress_output
 
   snyk-scan:
-    docker:
-      - image: cimg/python:3.10
+    executor: dotnet-executor
     steps:
       - attach_workspace:
           at: .
-      - general-platform-helpers/step-load-dependencies
-      - general-platform-helpers/step-run-snyk-monitor:
-          scan-all-projects: true
-          skip-unresolved: false
-          run-on-non-main: true
-          detection-depth: 4
+      - general-platform-helpers/step-setup-artifactory-bazel:
+          jfrog_token: ARTIFACTORY_TOKEN
+      - general-platform-helpers/step-snyk-dotnet-scan:
+          artifact_dir: Okta.Xamarin/Okta.Xamarin
 
 workflows:
-  version: 2
-  build-and-scan:
+  build-and-snyk:
     jobs:
       - build
       - snyk-scan:
-          name: execute-snyk
+          requires:
+            - build
           context:
             - static-analysis
+          filters:
+            branches:
+              only:
+                - master
+                - /^OKTA-.*/
+
+  "Malware Scanner":
+    jobs:
+      - build
+      - reversing-labs:
           requires:
             - build
-      - reversing-labs:
-          name: malware-scan
           context:
             - static-analysis