Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
114 changes: 0 additions & 114 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ stages:
- test
- after_test
- review
- scan

workflow:
rules:
Expand Down Expand Up @@ -96,7 +95,6 @@ build-idp-image:
needs: []
interruptible: true
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
- if: $CI_PIPELINE_SOURCE != "merge_request_event"
when: never
Expand Down Expand Up @@ -399,115 +397,3 @@ stop-review-app:
include:
- template: Jobs/SAST.gitlab-ci.yml
- template: Jobs/Dependency-Scanning.gitlab-ci.yml

# Export the automated ECR scan results into a format Gitlab can use
# Report schema https://gitlab.com/gitlab-org/security-products/security-report-schemas/-/blob/master/dist/container-scanning-report-format.json
ecr-scan:
stage: scan
interruptible: true
allow_failure: true
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
- if: $CI_PIPELINE_SOURCE != "merge_request_event"
when: never
tags:
- build-pool
needs:
- job: build-idp-image
image:
name: amazon/aws-cli
entrypoint: [""]
before_script:
- curl -LO https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64
- chmod +x jq-linux64
- mv jq-linux64 /usr/local/bin/jq
script:
- >
while true; do
SCAN_STATUS=$(aws ecr describe-image-scan-findings --repository-name identity-idp/review --image-id imageTag=$CI_COMMIT_SHA --query 'imageScanStatus.status' --output text || true)
if [ "$SCAN_STATUS" == "ACTIVE" ]; then
break
elif [ "$SCAN_STATUS" == "FAILED" ]; then
echo "ECR scan failed"
exit 1
else
echo "Waiting for ECR scan to complete"
sleep 15
fi
done
- SCAN_FINDINGS=$(aws ecr describe-image-scan-findings --repository-name identity-idp/review --image-id imageTag=$CI_COMMIT_SHA)
- echo $SCAN_FINDINGS
- >
echo $SCAN_FINDINGS |
jq -r '
{
"version": "15.0.4",
"scan": {
"start_time": (.imageScanFindings.imageScanCompletedAt | sub("\\.[0-9]+"; "") | strptime("%Y-%m-%dT%H:%M:%S%z") | strftime("%Y-%m-%dT%H:%M:%S")),
"end_time": (.imageScanFindings.imageScanCompletedAt | sub("\\.[0-9]+"; "") | strptime("%Y-%m-%dT%H:%M:%S%z") | strftime("%Y-%m-%dT%H:%M:%S")),
"scanner": {
"id": "clair",
"name": "Amazon ECR Image Scan",
"version": "1.0.0",
"vendor": {
"name": "Amazon Web Services"
}
},
"analyzer": {
"id": "clair",
"name": "Amazon ECR Image Scan",
"version": "1.0.0",
"vendor": {
"name": "Amazon Web Services"
}
},
"status": "success",
"type": "container_scanning"
},
"vulnerabilities": [
.imageScanFindings.enhancedFindings[] |
{
"id": .packageVulnerabilityDetails.vulnerabilityId,
"name": .title,
"description": .description,
"severity": (if .severity == "HIGH" then "High"
elif .severity == "MEDIUM" then "Medium"
elif .severity == "LOW" then "Low"
elif .severity == "CRITICAL" then "Critical"
elif .severity == "INFORMATIONAL" then "Info"
elif .severity == "UNTRIAGED" then "Info"
else "Unknown" end),
"solution": .remediation.recommendation.text,
"identifiers": [
{
"type": "cve",
"name": .packageVulnerabilityDetails.vulnerabilityId,
"url": .packageVulnerabilityDetails.sourceUrl,
"value": .packageVulnerabilityDetails.vulnerabilityId
}
],
"links": [
{
"name": .packageVulnerabilityDetails.vulnerabilityId,
"url": .packageVulnerabilityDetails.sourceUrl
}
],
"location": {
"dependency": {
"package": {
"name": .packageVulnerabilityDetails.vulnerablePackages[0].name
},
"version": .packageVulnerabilityDetails.vulnerablePackages[0].version
},
"operating_system": .resources[0].details.awsEcrContainerImage.platform,
"image": .resources[0].id
}
}
]
}' > gl-container-scanning-report.json
artifacts:
paths:
- gl-container-scanning-report.json
reports:
container_scanning: gl-container-scanning-report.json
13 changes: 0 additions & 13 deletions app/controllers/concerns/idv/getting_started_ab_test_concern.rb

This file was deleted.

84 changes: 0 additions & 84 deletions app/controllers/idv/getting_started_controller.rb

This file was deleted.

15 changes: 2 additions & 13 deletions app/controllers/idv/please_call_controller.rb
Original file line number Diff line number Diff line change
@@ -1,25 +1,14 @@
module Idv
class PleaseCallController < ApplicationController
include FraudReviewConcern

before_action :confirm_two_factor_authenticated
before_action :handle_fraud_rejection
before_action :confirm_fraud_pending

FRAUD_REVIEW_CONTACT_WITHIN_DAYS = 14.days

def show
analytics.idv_please_call_visited
pending_at = current_user.fraud_review_pending_profile.fraud_review_pending_at
pending_at = current_user.fraud_review_pending_profile.fraud_review_pending_at ||
Time.zone.today
@call_by_date = pending_at + FRAUD_REVIEW_CONTACT_WITHIN_DAYS
end

private

def confirm_fraud_pending
if !fraud_review_pending?
redirect_to account_url
end
end
end
end
10 changes: 5 additions & 5 deletions app/controllers/idv/welcome_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ class WelcomeController < ApplicationController
include IdvStepConcern
include StepIndicatorConcern
include StepUtilitiesConcern
include GettingStartedAbTestConcern

before_action :confirm_welcome_needed
before_action :maybe_redirect_for_getting_started_ab_test

def show
analytics.idv_doc_auth_welcome_visited(**analytics_arguments)

Funnel::DocAuth::RegisterStep.new(current_user.id, sp_session[:issuer]).
call('welcome', :view, true)
Funnel::DocAuth::RegisterStep.new(current_user.id, sp_session[:issuer]).call(
'welcome', :view,
true
)

render :show
render :show, locals: { flow_session: flow_session }
end

def update
Expand Down
6 changes: 4 additions & 2 deletions app/forms/gpo_verify_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ def submit
pending_profile&.deactivate(:in_person_verification_pending)
elsif fraud_review_checker.fraud_check_failed? && threatmetrix_enabled?
bump_fraud_review_pending_timestamps
elsif fraud_review_checker.fraud_check_failed?
pending_profile&.activate_after_fraud_review_unnecessary
else
pending_profile&.update!(
fraud_review_pending_at: nil,
fraud_rejection_at: nil,
)
activate_profile
end
else
Expand Down
1 change: 0 additions & 1 deletion app/javascript/packages/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ export { default as ProcessList } from './process-list/process-list';
export { default as ProcessListHeading } from './process-list/process-list-heading';
export { default as ProcessListItem } from './process-list/process-list-item';
export { default as ScrollIntoView } from './scroll-into-view';
export { default as SelectInput } from './select-input';
export { default as SpinnerDots } from './spinner-dots';
export { default as StatusPage } from './status-page';
export { default as Tag } from './tag';
Expand Down
Loading