Download file

.circleci/config.yml

@@ -46,11 +46,11 @@ references:
       SERVER_BRANCH_NAME: << pipeline.parameters.server_branch_name >>
       BACKWARD_COMPATIBILITY: << pipeline.parameters.backward_compatibility >>
       MEM_CHECK: << pipeline.parameters.mem_check >>
-      TIME_TO_LIVE: << pipeline.parameters.time_to_live >>
       CONTRIB_BRANCH: << pipeline.parameters.contrib_branch >>
       CONTRIB_PACK_NAME: << pipeline.parameters.contrib_pack_name >>
       # Giving different names to the following pipeline parameters to avoid collision, handling such collision case
       # is done in 'Prepare Environment' step.
+      TIME_TO_LIVE_PARAMETER: << pipeline.parameters.time_to_live >>
       NIGHTLY_PARAMETER: << pipeline.parameters.nightly >>
       INSTANCE_TESTS_PARAMETER: << pipeline.parameters.instance_tests >>
       DEMISTO_SDK_NIGHTLY_PARAMETER: << pipeline.parameters.demisto_sdk_nightly >>
@@ -97,6 +97,10 @@ references:
         then
             echo 'export DEMISTO_SDK_NIGHTLY=true' >> $BASH_ENV
         fi
+        if [ -n "${TIME_TO_LIVE_PARAMETER}" ];
+        then
+            echo "export TIME_TO_LIVE=$TIME_TO_LIVE_PARAMETER" >> $BASH_ENV
+        fi
         echo "=== sourcing $BASH_ENV ==="
         source $BASH_ENV
         sudo mkdir -p -m 777 $CIRCLE_ARTIFACTS
@@ -392,9 +396,32 @@ jobs:
                     then
                       python3 ./Tests/scripts/verify_base_branch_for_contribution.py $CIRCLE_BRANCH
                   fi
+      - unless:
+          condition:
+            or:
+              - << pipeline.parameters.instance_tests >>
+              - equal:
+                  - master
+                  - << pipeline.git.branch >>
+          steps:
+            - run:
+                name: validate content-test-conf branch merged
+                shell: /bin/bash
+                when: always
+                command: |
+                  # replace slashes ('/') in the branch name, if exist, with underscores ('_')
+                  UNDERSCORE_CIRCLE_BRANCH=${CIRCLE_BRANCH//\//_}
+                  wget --header "Accept: application/vnd.github.v3.raw" --header "Authorization: token $GITHUB_TOKEN" "https://github.com/demisto/content-test-conf/archive/$UNDERSCORE_CIRCLE_BRANCH.zip" --no-check-certificate -q
+                  if [ "$?" != "0" ]; then
+                    echo "No such branch in content-test-conf: $UNDERSCORE_CIRCLE_BRANCH"
+                    exit 0
+                  else
+                    echo "ERROR: Found a branch with the same name in contest-test-conf conf.json - $UNDERSCORE_CIRCLE_BRANCH.\n Merge it in order to merge the current branch into content repo."
+                    exit 1
+                  fi
   Create Instances:
     <<: *container_config
-    resource_class: medium+
+    resource_class: medium
     <<: *environment
     steps:
       - checkout
@@ -495,7 +522,7 @@ jobs:
       - *persist_to_workspace
   Server 4_1:
     <<: *container_config
-    resource_class: medium+
+    resource_class: medium
     <<: *environment
     steps:
       - setup_remote_docker
@@ -543,7 +570,7 @@ jobs:
             - *store_artifacts
   Server 4_5:
     <<: *container_config
-    resource_class: medium+
+    resource_class: medium
     <<: *environment
     steps:
       - setup_remote_docker
@@ -590,7 +617,7 @@ jobs:
             - *store_artifacts
   Server 5_0:
     <<: *container_config
-    resource_class: medium+
+    resource_class: medium
     <<: *environment
     steps:
       - setup_remote_docker
@@ -642,7 +669,7 @@ jobs:
             - *store_artifacts
   Server 5_5:
     <<: *container_config
-    resource_class: medium+
+    resource_class: medium
     <<: *environment
     steps:
       - setup_remote_docker
@@ -688,17 +715,11 @@ jobs:
                   else
                       echo "Not AMI run, can't run on this version"
                   fi
-            - run:
-                name: Slack Notifier
-                shell: /bin/bash
-                command: |
-                  ./Tests/scripts/slack_notifier.sh 'test_playbooks' ./env_results.json
-                when: always
             - *destroy_instances
             - *store_artifacts
   Server 6_0:
     <<: *container_config
-    resource_class: medium+
+    resource_class: medium
     <<: *environment
     steps:
       - setup_remote_docker
@@ -759,11 +780,17 @@ jobs:
                   python3 ./Tests/Marketplace/upload_packs.py -a $PACK_ARTIFACTS -e $EXTRACT_FOLDER -b 'marketplace-dist' -d $PACKS_DEPENDENCIES -i $ID_SET -s $GCS_PATH -n $CIRCLE_BUILD_NUM -k $PACK_SIGNING_KEY -pb 'marketplace-dist-private'
                   rm $GCS_PATH
                 when: on_success
+            - run:
+                name: Slack Notifier
+                shell: /bin/bash
+                command: |
+                  ./Tests/scripts/slack_notifier.sh 'test_playbooks' ./env_results.json
+                when: always
             - *destroy_instances
             - *store_artifacts
   Instance Test:
     <<: *container_config
-    resource_class: medium+
+    resource_class: medium
     <<: *environment
     steps:
       - setup_remote_docker
@@ -801,7 +828,7 @@ jobs:
 
   Demisto SDK Nightly:
     <<: *container_config
-    resource_class: medium+
+    resource_class: medium
     <<: *environment
     steps:
       - checkout
@@ -911,6 +938,7 @@ workflows:
       - Create Instances:
           context: nightly_env
       - Run Unit Testing And Lint:
+          context: nightly_env
           requires:
             - Prepare Environment
       - Run Validations:

Packs/Base/ReleaseNotes/1_1_4.md

@@ -0,0 +1,3 @@
+#### Scripts
+##### SaneDocReports
+- Added additional arguments for increased functionality when using logos

Packs/Base/Scripts/SaneDocReportV2/SaneDocReportV2.py

@@ -12,16 +12,19 @@
 try:
     sane_json_b64 = demisto.args().get('sane_docx_report_base64', '').encode(
         'utf-8')
-    orientation = demisto.args().get('orientation', 'portrait').encode(
-        'utf-8')
-    paper_size = demisto.args().get('paperSize', 'A4').encode(
-        'utf-8')
+    orientation = demisto.args().get('orientation', 'portrait')
+    paper_size = demisto.args().get('paperSize', 'A4')
+    demistoLogo = demisto.args().get('demistoLogo', '')
+    customerLogo = demisto.args().get('customerLogo', '')
+
     with open('sane.json', 'wb') as f:
         f.write(base64.b64decode(sane_json_b64))
 
     run('sane.json', OUTPUT_FILE_PATH, {
-        'orientation': orientation.decode('utf-8', 'ignore'),
-        'paper_size': paper_size.decode('utf-8', 'ignore')
+        'orientation': orientation,
+        'paper_size': paper_size,
+        'demistoLogo': demistoLogo,
+        'customerLogo': customerLogo,
     })
 
     with open(OUTPUT_FILE_PATH, 'rb') as f:

Packs/Base/Scripts/SaneDocReportV2/SaneDocReportV2.yml

@@ -14,11 +14,23 @@ args:
   secret: false
 - default: false
   defaultValue: A4
-  description: the paper size of the report
+  description: The paper size for the report.
   isArray: false
   name: paperSize
   required: false
   secret: false
+- default: false
+  description: Custom logo image.
+  isArray: false
+  name: customerLogo
+  required: false
+  secret: false
+- default: false
+  description: The logo for XSOAR.
+  isArray: false
+  name: demistoLogo
+  required: false
+  secret: false
 comment: Parse Sane-json-reports and export them as docx files (used internally, thus deprecated).
 commonfields:
   id: SaneDocReports
@@ -34,10 +46,10 @@ tags:
 timeout: '0'
 type: python
 subtype: python3
-dockerimage: demisto/sane-doc-reports:1.0.0.6861
+dockerimage: demisto/sane-doc-reports:1.0.0.9678
 runas: DBotWeakRole
 runonce: false
 tests:
 - No Test
 deprecated: true
-fromversion: 5.5.0
+fromversion: 5.5.0

Packs/Base/Scripts/SanePdfReport/SanePdfReport.yml

@@ -68,7 +68,7 @@ tags:
 - pdf
 timeout: '0'
 type: python
-dockerimage: demisto/sane-pdf-reports:1.0.0.9507
+dockerimage: demisto/sane-pdf-reports:1.0.0.9768
 runas: DBotWeakRole
 runonce: false
 tests:

Packs/Base/pack_metadata.json

@@ -2,7 +2,7 @@
     "name": "Base",
     "description": "The base pack for Cortex XSOAR.",
     "support": "xsoar",
-    "currentVersion": "1.1.3",
+    "currentVersion": "1.1.4",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",

Packs/BluelivThreatContext/.secrets-ignore

@@ -0,0 +1,10 @@
+103.76.228.28
+25.20.116.113
+https://attack.mitre.org
+https://mytenant.blueliv.com
+ad53660b6d7e8d2ed14bd59b39e1f265148e3c6818a494cce906e749976bade1
+http://www.priceminister.com
+103.143.173.25
+http://uk.ask.com
+http://seclists.org
+192.168.56.102

Packs/BluelivThreatContext/CHANGELOG.md

@@ -0,0 +1 @@
+## [Unreleased]