Merge branch 'splunk:develop' into mitre-caldera

Author: ZachTheSplunker

configs/attack_range_default.yml

@@ -171,7 +171,7 @@ phantom_server:
   phantom_server: "0"
   # Enable/Disable Phantom Server
 
-  phantom_app: "splunk_soar-unpriv-6.2.2.134-8f694086-el8-x86_64.tgz"
+  phantom_app: "splunk_soar-unpriv-6.3.1.178-d86bf7c2-el7-x86_64.tgz"
   # name of the Splunk SOAR package located in apps folder. 
   # aws: Make sure you use the RHEL 8 version which contains ....el8... in the file name
   # azure, local: Make sure you use the RHEL 7 version which contains ....el7... in the file name

modules/aws_controller.py

@@ -252,7 +252,7 @@ def show(self) -> None:
                             + ":8443"
                             + "\n\tSSH > ssh -i"
                             + self.config["aws"]["private_key_path"]
-                            + " centos@"
+                            + " ec2-user@"
                             + instance["NetworkInterfaces"][0]["Association"][
                                 "PublicIp"
                             ]
@@ -268,7 +268,7 @@ def show(self) -> None:
                             + ":8443"
                             + "\n\tSSH > ssh -i"
                             + self.config["aws"]["private_key_path"]
-                            + " centos@"
+                            + " ec2-user@"
                             + instance["NetworkInterfaces"][0]["Association"][
                                 "PublicIp"
                             ]

pyproject.toml

@@ -6,7 +6,7 @@ authors = ["P4T12ICK <[email protected]>"]
 
 [tool.poetry.dependencies]
 python = "^3.10"
-ansible = "^10.4.0"
+ansible = "<10.0.0"
 pywinrm = "^0.5.0"
 PyYAML = "^6.0.2"
 colorama = "^0.4.6"

terraform/ansible/roles/phantom/tasks/install_phantom_aws.yml

@@ -1,17 +1,16 @@
 ---
-# Install Phantom from RPM on a fresh CentOS 7 instance
 
-- name: Change mirror to vault.centos.org
-  shell: sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
-  become: yes
+# - name: Change mirror to vault.centos.org
+#   shell: sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
+#   become: yes
 
-- name: Uncomment baseurl lines
-  shell: sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
-  become: yes
+# - name: Uncomment baseurl lines
+#   shell: sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
+#   become: yes
 
-- name: Comment out mirrorlist lines
-  shell: sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
-  become: yes
+# - name: Comment out mirrorlist lines
+#   shell: sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
+#   become: yes
 
 - name: Update all packages
   become: yes