Skip to content

Commit

Permalink
Merge branch 'master' into PRWLR-5471-Cleaning-for-v5
Browse files Browse the repository at this point in the history
  • Loading branch information
paabloLC committed Nov 26, 2024
2 parents 01bdb2a + 0b2e1f1 commit 286b323
Show file tree
Hide file tree
Showing 9 changed files with 147 additions and 74 deletions.
3 changes: 3 additions & 0 deletions .github/codeql/ui-codeql-config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
name: "Custom CodeQL Config for UI"
paths:
- "ui/"
61 changes: 61 additions & 0 deletions .github/workflows/ui-codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "UI - CodeQL"

on:
push:
branches:
- "master"
- "v4.*"
- "v5.*"
paths:
- "ui/**"
pull_request:
branches:
- "master"
- "v4.*"
- "v5.*"
paths:
- "ui/**"
schedule:
- cron: "00 12 * * *"

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: ["javascript"]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
config-file: ./.github/codeql/ui-codeql-config.yml

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
4 changes: 2 additions & 2 deletions docs/tutorials/configuration_file.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ The following list includes all the AWS checks with configurable variables that
| `ec2_launch_template_no_secrets` | `secrets_ignore_patterns` | List of Strings |
| `ec2_securitygroup_allow_ingress_from_internet_to_any_port` | `ec2_allowed_instance_owners` | List of Strings |
| `ec2_securitygroup_allow_ingress_from_internet_to_any_port` | `ec2_allowed_interface_types` | List of Strings |
| `ec2_securitygroup_allow_ingress_from_internet_to_high_risk_tcp_ports`| `ec2_sg_high_risk_ports` | List of Integer |
| `ec2_securitygroup_allow_ingress_from_internet_to_high_risk_tcp_ports`| `ec2_high_risk_ports` | List of Integer |
| `ec2_securitygroup_with_many_ingress_egress_rules` | `max_security_group_rules` | Integer |
| `ecs_task_definitions_no_environment_secrets` | `secrets_ignore_patterns` | List of Strings |
| `ecr_repositories_scan_vulnerabilities_in_latest_image` | `ecr_repository_vulnerability_minimum_severity` | String |
Expand Down Expand Up @@ -144,7 +144,7 @@ aws:
"amazon-elb"
]
# aws.ec2_securitygroup_allow_ingress_from_internet_to_high_risk_tcp_ports
ec2_sg_high_risk_ports:
ec2_high_risk_ports:
[
25,
110,
Expand Down
134 changes: 67 additions & 67 deletions poetry.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion prowler/config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ aws:
"amazon-elb"
]
# aws.ec2_securitygroup_allow_ingress_from_internet_to_high_risk_tcp_ports
ec2_sg_high_risk_ports:
ec2_high_risk_ports:
[
25,
110,
Expand Down
9 changes: 9 additions & 0 deletions prowler/providers/aws/aws_regions_by_service.json
Original file line number Diff line number Diff line change
Expand Up @@ -10098,6 +10098,15 @@
]
}
},
"socialmessaging": {
"regions": {
"aws": [
"eu-central-1"
],
"aws-cn": [],
"aws-us-gov": []
}
},
"sqs": {
"regions": {
"aws": [
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ tzlocal = "5.2"
[tool.poetry.group.dev.dependencies]
bandit = "1.7.10"
black = "24.10.0"
coverage = "7.6.7"
coverage = "7.6.8"
docker = "7.1.0"
flake8 = "7.1.1"
freezegun = "1.5.1"
Expand All @@ -100,7 +100,7 @@ optional = true
[tool.poetry.group.docs.dependencies]
mkdocs = "1.6.1"
mkdocs-git-revision-date-localized-plugin = "1.3.0"
mkdocs-material = "9.5.45"
mkdocs-material = "9.5.46"
mkdocs-material-extensions = "1.3.1"

[tool.poetry.scripts]
Expand Down
2 changes: 1 addition & 1 deletion tests/config/config_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def mock_prowler_get_latest_release(_, **kwargs):
"max_ec2_instance_age_in_days": 180,
"ec2_allowed_interface_types": ["api_gateway_managed", "vpc_endpoint"],
"ec2_allowed_instance_owners": ["amazon-elb"],
"ec2_sg_high_risk_ports": [
"ec2_high_risk_ports": [
25,
110,
135,
Expand Down
2 changes: 1 addition & 1 deletion tests/config/fixtures/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ aws:
"amazon-elb"
]
# aws.ec2_securitygroup_allow_ingress_from_internet_to_high_risk_tcp_ports
ec2_sg_high_risk_ports:
ec2_high_risk_ports:
[
25,
110,
Expand Down

0 comments on commit 286b323

Please sign in to comment.