Skip to content

Commit

Permalink
Merge branch 'main' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
vladdoster authored Sep 26, 2024
2 parents 27e5805 + f48d68f commit b555ec9
Show file tree
Hide file tree
Showing 35 changed files with 1,379 additions and 328 deletions.
Binary file added jfrog-applications/.gitbook/assets/cli-ai.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added jfrog-applications/.gitbook/assets/image (1).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 19 additions & 10 deletions jfrog-applications/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
* [Configurations](jfrog-cli/get-started/configurations/README.md)
* [JFrog Platform Configuration](jfrog-cli/get-started/configurations/jfrog-platform-configuration.md)
* [Proxy Support](jfrog-cli/get-started/configurations/proxy-support.md)
* [CLI AI Assistant](jfrog-cli/cli-ai/README.md)
* [AI Terms and Conditions](jfrog-cli/cli-ai/terms.md)
* [CLI for JFrog Artifactory](jfrog-cli/cli-for-jfrog-artifactory/README.md)
* [Environment Variables](jfrog-cli/cli-for-jfrog-artifactory/environment-variables.md)
* [Authentication](jfrog-cli/cli-for-jfrog-artifactory/authentication.md)
Expand All @@ -32,7 +34,9 @@
* [cUrl Integration](jfrog-cli/cli-for-jfrog-security/curl-integration.md)
* [Scan Published Builds](jfrog-cli/cli-for-jfrog-security/scan-published-builds.md)
* [Scan your Binaries](jfrog-cli/cli-for-jfrog-security/scan-your-binaries.md)
* [Enrich your SBOM JSONs & XMLs](jfrog-cli/cli-for-jfrog-security/enrich-your-sbom.md)
* [Download Updates for Xray's Database](jfrog-cli/cli-for-jfrog-security/download-updates-for-xrays-database.md)
* [Count Contributing Developers](jfrog-applications/jfrog-cli/cli-for-jfrog-security/count-contributing-developers.md)
* [CLI for JFrog Curation](jfrog-cli/cli-for-jfrog-curation.md)
* [CLI for JFrog Distribution](jfrog-cli/cli-for-jfrog-distribution.md)
* [CLI for JFrog Pipelines](jfrog-cli/cli-for-jfrog-pipelines.md)
Expand Down Expand Up @@ -66,19 +70,24 @@
* [Supported Technologies](jfrog-applications/frogbot/supported-technologies.md)
* [Setup](frogbot/setup-frogbot.md)
* [Frogbot Configuration](frogbot/frogbot-configuration.md)
* [Setup Frogbot Using GitHub Actions](frogbot/setup-frogbot-using-github-actions.md)
* [Setup Frogbot Using GitHub Actions](jfrog-applications/frogbot/setup-frogbot/setup-frogbot-using-github-actions/README.md)
* [OIDC Authentication](jfrog-applications/frogbot/setup-frogbot/setup-frogbot-using-github-actions/oidc-authentication.md)
* [Scan Git Repository Full Template](jfrog-applications/frogbot/setup-frogbot/setup-frogbot-using-github-actions/scan-git-repository-full-template.md)
* [Scan Pull Request Full Template](jfrog-applications/frogbot/setup-frogbot/setup-frogbot-using-github-actions/scan-pull-request-full-template.md)
* [Setup Frogbot Using Jenkins](frogbot/setup-frogbot-using-jenkins.md)
* [Setup Frogbot Using JFrog Pipelines](frogbot/setup-frogbot-using-jfrog-pipelines.md)
* [Setup Frogbot Using GitLab CI](frogbot/setup-frogbot-using-gitlab-ci.md)
* [Setup Frogbot Using GitLab CI](jfrog-applications/frogbot/setup-frogbot/setup-frogbot-using-gitlab-ci/README.md)
* [GitLab Full Template](jfrog-applications/frogbot/setup-frogbot/setup-frogbot-using-gitlab-ci/gitlab-full-template.md)
* [Setup Frogbot Using Azure Pipelines](frogbot/setup-frogbot-using-azure-pipelines.md)
* [Scan Pull Requests](jfrog-applications/frogbot/scan-pull-requests/README.md)
* [Scan GitHub Pull Request](jfrog-applications/frogbot/scan-pull-requests/scan-github-pull-request.md)
* [Scan Gitlab Pull Request](jfrog-applications/frogbot/scan-pull-requests/scan-gitlab-pull-request.md)
* [Scan Azure Repos Pull Request](jfrog-applications/frogbot/scan-pull-requests/scan-azure-repos-pull-request.md)
* [Scan Bitbucket Server Pull Request](jfrog-applications/frogbot/scan-pull-requests/scan-bitbucket-server-pull-request.md)
* [Pull Request Scan Results](jfrog-applications/frogbot/scan-pull-requests/pull-request-scan-results.md)
* [Scan Git Repositories](jfrog-applications/frogbot/scan-repositories/README.md)
* [View Security Alerts on GitHub](jfrog-applications/frogbot/scan-repositories/view-security-alerts-on-github.md)
* [Scan Execution](jfrog-applications/frogbot/scan-execution/README.md)
* [Scan Git Repositories](jfrog-applications/frogbot/scan-execution/scan-repositories/README.md)
* [View Security Alerts on GitHub](jfrog-applications/frogbot/scan-execution/scan-repositories/view-security-alerts-on-github.md)
* [Scan Pull Requests](jfrog-applications/frogbot/scan-execution/scan-pull-requests/README.md)
* [Scan GitHub Pull Request](jfrog-applications/frogbot/scan-execution/scan-pull-requests/scan-github-pull-request.md)
* [Scan GitLab Pull Request](jfrog-applications/frogbot/scan-execution/scan-pull-requests/scan-gitlab-pull-request.md)
* [Scan Azure Repos Pull Request](jfrog-applications/frogbot/scan-execution/scan-pull-requests/scan-azure-repos-pull-request.md)
* [Scan Bitbucket Server Pull Request](jfrog-applications/frogbot/scan-execution/scan-pull-requests/scan-bitbucket-server-pull-request.md)
* [Pull Request Scan Results](jfrog-applications/frogbot/scan-execution/scan-pull-requests/pull-request-scan-results.md)
* [Frogbot Badge](frogbot/frogbot-badge.md)

## CI & SDKs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ As shown in the above [Including the Script](broken-reference/) and [Referencing
Configurations can be done via Project Settings > CI/CD > Variables:

| Variable | Usage |
| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|----------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| JF\_DOCKER\_REGISTRY | Docker registry in Artifactory. For more info, see [Getting Started with Artifactory as a Docker Registry](https://www.jfrog.com/confluence/display/JFROG/Getting+Started+with+Artifactory+as+a+Docker+Registry) |
| JFROG\_CLI\_BUILD\_PROJECT | JFrog project key to be used by commands which expect build name and build number. Determines the project of the published build. |
| JFROG\_CLI\_VERSION | Use a specific JFrog CLI version instead of the latest version. The minimal version allowed is: 2.17.0 |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Setup Frogbot Using Azure Pipelines

**Important Notice**: For Scanning Pull Requests, it is advisable to refrain from setting up Frogbot using Azure Pipelines for open source projects. For further details, please refer to the [👮 Security Note for Pull Requests Scanning](../jfrog-applications/frogbot/scan-pull-requests/#security-note-for-pull-requests-scanning).
**Important Notice**: For Scanning Pull Requests, it is advisable to refrain from setting up Frogbot using Azure Pipelines for open source projects. For further details, please refer to the [👮 Security Note for Pull Requests Scanning](../jfrog-applications/frogbot/scan-execution/scan-pull-requests/#security-note-for-pull-requests-scanning).

To install Frogbot on Azure Repos repositories, follow these steps.

Expand Down
97 changes: 0 additions & 97 deletions jfrog-applications/frogbot/setup-frogbot-using-github-actions.md

This file was deleted.

2 changes: 1 addition & 1 deletion jfrog-applications/frogbot/setup-frogbot-using-jenkins.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Setup Frogbot Using Jenkins

**Important Notice**: For Scanning Pull Requests, it is advisable to refrain from setting up Frogbot using Jenkins for open source projects. For further details, please refer to the [👮 Security Note for Pull Requests Scanning](../jfrog-applications/frogbot/scan-pull-requests/#security-note-for-pull-requests-scanning).
**Important Notice**: For Scanning Pull Requests, it is advisable to refrain from setting up Frogbot using Jenkins for open source projects. For further details, please refer to the [👮 Security Note for Pull Requests Scanning](../jfrog-applications/frogbot/scan-execution/scan-pull-requests/#security-note-for-pull-requests-scanning).

#### 🖥️ Follow these steps to install Frogbot on Jenkins

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Setup Frogbot Using JFrog Pipelines

**Important Notice**: For Scanning Pull Requests, it is advisable to refrain from setting up Frogbot using JFrog Pipelines for open source projects. For further details, please refer to the [👮 Security Note for Pull Requests Scanning](../jfrog-applications/frogbot/scan-pull-requests/#security-note-for-pull-requests-scanning).
**Important Notice**: For Scanning Pull Requests, it is advisable to refrain from setting up Frogbot using JFrog Pipelines for open source projects. For further details, please refer to the [👮 Security Note for Pull Requests Scanning](../jfrog-applications/frogbot/scan-execution/scan-pull-requests/#security-note-for-pull-requests-scanning).

* Make sure you have the connection details of your JFrog Platform.
* Inside JFrog Pipelines, save the JFrog connection details as a [JFrog Platform Access Token Integration](https://www.jfrog.com/confluence/display/JFROG/JFrog+Platform+Access+Token+Integration) named **jfrogPlatform**.
Expand Down
4 changes: 2 additions & 2 deletions jfrog-applications/frogbot/setup-frogbot.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

#### Select your preferred CI server:

* [GitHub Actions](setup-frogbot-using-github-actions.md)
* [GitHub Actions](../jfrog-applications/frogbot/setup-frogbot/setup-frogbot-using-github-actions/)
* [Jenkins](setup-frogbot-using-jenkins.md)
* [JFrog Pipelines](setup-frogbot-using-jfrog-pipelines.md)
* [GitLab CI](setup-frogbot-using-gitlab-ci.md)
* [GitLab CI](../jfrog-applications/frogbot/setup-frogbot/setup-frogbot-using-gitlab-ci/)
* [Azure Pipelines](setup-frogbot-using-azure-pipelines.md)

<details>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scan Execution

Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

Frogbot scans your Git repositories periodically and automatically creates pull requests for upgrading vulnerable dependencies to a version with a fix.

![](../../../.gitbook/assets/fix-pr.png)
![](../../../../.gitbook/assets/fix-pr.png)

_**NOTE:**_ The pull request fix is presently unavailable for older NuGet projects that use the package.config file instead of the PackageReference syntax.

####
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
# View Security Alerts on GitHub

For GitHub repositories, issues that are found during Frogbot's periodic scans are also added to the [Security Alerts](https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/managing-code-scanning-alerts-for-your-repository) view in the UI.
For GitHub repositories, issues that are found during Frogbot's repository scans are also added to the [Security Alerts](https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/managing-code-scanning-alerts-for-your-repository) view in the UI.

![](../../../.gitbook/assets/github-code-scanning.png)
![](../../../../.gitbook/assets/github-code-scanning.png)

The following alert types are supported:

**1. CVEs on vulnerable dependencies**

![](../../../.gitbook/assets/github-code-scanning-content.png)
![](../../../../.gitbook/assets/github-code-scanning-content.png)

**2. Secrets that are exposed in the code**

![](../../../.gitbook/assets/github-code-scanning-secrets-content.png)
![](../../../../.gitbook/assets/github-code-scanning-secrets-content.png)

**3. Infrastructure as Code (Iac) issues on Terraform packages**

![](../../../.gitbook/assets/github-code-scanning-iac-content.png)
![](../../../../.gitbook/assets/github-code-scanning-iac-content.png)

**4. Static Application Security Testing (Sast) vulnerabilities**

![](../../../.gitbook/assets/github-code-scanning-sast-content.png)
![](../../../../.gitbook/assets/github-code-scanning-sast-content.png)

**5. Validate Allowed Licenses**

When Frogbot scans the repository periodically, it checks the licenses of any project dependencies. If Frogbot identifies licenses that are not listed in a predefined set of approved licenses, it adds an alert. The list of allowed licenses is set up as a variable within the Frogbot workflow.

![](../../../.gitbook/assets/github-code-scanning-license-violation-content.png)
![](../../../../.gitbook/assets/github-code-scanning-license-violation-content.png)
Loading

0 comments on commit b555ec9

Please sign in to comment.