Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fine tune JFrog Advanced Security on this project #2299

Merged
merged 3 commits into from
Nov 9, 2023
Merged

Fine tune JFrog Advanced Security on this project #2299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6003308
Fine tune JFrog Advanced Security on this project
yahavi Nov 9, 2023
cd8fae8
Fix TestXrayAuditMultiProjects
yahavi Nov 9, 2023
7990459
Merge branch 'dev' into tune-jas
yahavi Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .jfrog/jfrog-apps-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
version: "1.0"
modules:
- exclude_patterns:
- "**/.git/**"
- "**/node_modules/**"
- "**/out/**"

# Included in .gitignore:
- "**/.vscode/**"
- "**/.idea/**"
exclude_scanners:
- "iac"
scanners:
sast:
exclude_patterns:
- "**/testdata/**"
- "**/docs/**"
secrets:
exclude_patterns:
- "**/testdata/xray/jas-config/secrets/**"
- "**/testdata/xray/jas-test/secrets/**"
2 changes: 2 additions & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ def downloadToolsCert() {
// Config Repo21 as default server.
def configRepo21() {
withCredentials([
// jfrog-ignore - false positive
usernamePassword(credentialsId: 'repo21', usernameVariable: 'REPO21_USER', passwordVariable: 'REPO21_PASSWORD'),
string(credentialsId: 'repo21-url', variable: 'REPO21_URL')
]) {
Expand Down Expand Up @@ -466,6 +467,7 @@ def publishChocoPackage(version, jfrogCliRepoDir, architectures) {

def dockerLogin(){
withCredentials([
// jfrog-ignore - false positive
usernamePassword(credentialsId: 'repo21', usernameVariable: 'REPO21_USER', passwordVariable: 'REPO21_PASSWORD'),
string(credentialsId: 'repo21-url', variable: 'REPO21_URL')
]) {
Expand Down
1 change: 1 addition & 0 deletions testdata/npm/npmnpmrcproject/.npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ registry=http://NO-NO-REPO/
_auth=YWRtaW46QVBFG1ZkZFMzN3NCakJiaRFVBThVb0JlZzFl
always-auth=true
email=ddd@dd.dd
# jfrog-ignore - not a real token
//NO-NO-REPO/:_authToken=eyJ2ZXIiOzfsdhiOiIyR3A5cDlUYW44NmpaTkxDNlBpa0lmWTU1Uk9Kc1pfNGlFUnRQLVsdfhZmFjdG9yeUBsdhjZDc2MGJmOC0wNjI0LTQwYTYtOGEyMS0zOTViMzg1OWQzNzVcL3VzZXJzXC9hZG1pbiIsInNjcCI6Im1lbWJlci1vZi1ncm91cHM6KiBhcGk6KiIsImF1ZCI6ImpmLWFydGlmYWN0b3J5QGNkNzYwYmY4LTA2MjQtNDBhNisdhmpmLWFydGlmYWN0b3J5QGNkNzYwYmY4LTA2MjQtNDBhNi04YTIxLTM5NWIzODU5ZDM3NSIsImlhdCI6MTUxMzI0MjcxMywianRpIjoiNWZiYmY1ZDAtYjUzNC00ZWMxLWE3NDItZTRiMjNmZDA4YTI5In0.pwNys1ek1v7BtjESjlEMgiVLAdD60vwh1EWvuoGSaxAvu1ppW1fwCJmNjJ69HJbA58tq-AfkusKhr7juoIw2TaIsikyrnrDHv1ELaFupAxDMkDfx4w1GQO3dMzWYDAYoVfeaImpdXQ3_pKemR5eLiRiqJrtEfj52OfIFyVPOuBTvtoqDe8-DvFNFz0TyUAfbLvya8S9I6KGr2mxR4v8eir4me8zp0lPBm7oIKL_tfgr5uP9naTrUg5Ydfkc-vhwU0jK-45R3RQPbpW-NE78yy17TVJuxgE0s2OtMWmLpvr3FJaPCJ5VGPtRexJFbN_7BhR2tl02Wys41lk6pqSpRlA
1 change: 1 addition & 0 deletions testdata/xray/jas-config/sast/flask_webgoat/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ def query_db(query, args=(), one=False, commit=False):

def create_app():
app = Flask(__name__)
# jfrog-ignore - disable secrets scan findings
app.secret_key = "aeZ1iwoh2ree2mo0Eereireong4baitixaixu5Ee"

db_path = Path(DB_FILENAME)
Expand Down
1 change: 1 addition & 0 deletions testdata/xray/jas-test/sast/flask_webgoat/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ def query_db(query, args=(), one=False, commit=False):

def create_app():
app = Flask(__name__)
# jfrog-ignore - disable secrets scan findings
app.secret_key = "aeZ1iwoh2ree2mo0Eereireong4baitixaixu5Ee"

db_path = Path(DB_FILENAME)
Expand Down
8 changes: 5 additions & 3 deletions utils/tests/consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,11 @@ var (
GoPublishWithExclusionPath = "github.com/jfrog/dependency/@v/github.com/jfrog/dependency@v1.1.1/"

// Users
UserName1 = "alice"
Password1 = "A12356789z"
UserName2 = "bob"
UserName1 = "alice"
// jfrog-ignore - not a real password
Password1 = "A12356789z"
UserName2 = "bob"
// jfrog-ignore - not a real password
Password2 = "1B234578y9"
ProjectKey = "prj"
)
Expand Down
2 changes: 2 additions & 0 deletions xray_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,8 @@ func TestXrayAuditMultiProjects(t *testing.T) {
multiProject := filepath.Join(filepath.FromSlash(tests.GetTestResourcesPath()), "xray")
// Copy the multi project from the testdata to a temp dir
assert.NoError(t, biutils.CopyDir(multiProject, tempDirPath, true, nil))
prevWd := changeWD(t, tempDirPath)
defer clientTestUtils.ChangeDirAndAssert(t, prevWd)
workingDirsFlag := fmt.Sprintf("--working-dirs=%s, %s ,%s, %s",
filepath.Join(tempDirPath, "maven"), filepath.Join(tempDirPath, "nuget", "single4.0"),
filepath.Join(tempDirPath, "python", "pip"), filepath.Join(tempDirPath, "jas-test"))
Expand Down