Merge branch...

Merge branch 'philipcunningham-allow-connection-type-filtering-canonical-url-for-dast-site-profile-277403' into 'master'

Filter DastSiteValidations by normalizedTargetUrls

See merge request gitlab-org/gitlab!48732

doc/api/graphql/reference/gitlab_schema.graphql

@@ -5423,6 +5423,26 @@ type DastSiteValidation {
   status: DastSiteProfileValidationStatusEnum!
 }
 
+"""
+The connection type for DastSiteValidation.
+"""
+type DastSiteValidationConnection {
+  """
+  A list of edges.
+  """
+  edges: [DastSiteValidationEdge]
+
+  """
+  A list of nodes.
+  """
+  nodes: [DastSiteValidation]
+
+  """
+  Information to aid in pagination.
+  """
+  pageInfo: PageInfo!
+}
+
 """
 Autogenerated input type of DastSiteValidationCreate
 """
@@ -5478,6 +5498,21 @@ type DastSiteValidationCreatePayload {
   status: DastSiteProfileValidationStatusEnum
 }
 
+"""
+An edge in a connection.
+"""
+type DastSiteValidationEdge {
+  """
+  A cursor for use in pagination.
+  """
+  cursor: String!
+
+  """
+  The item at the end of the edge.
+  """
+  node: DastSiteValidation
+}
+
 """
 Identifier of DastSiteValidation
 """
@@ -15951,15 +15986,52 @@ type Project {
   ): DastSiteProfileConnection
 
   """
-  DAST Site Validation associated with the project
+  DAST Site Validation associated with the project. Will always return `null` if
+  `security_on_demand_scans_site_validation` is disabled
   """
   dastSiteValidation(
     """
-    target URL of the DAST Site Validation
+    Normalized URL of the target to be scanned
+    """
+    normalizedTargetUrls: [String!]
+
+    """
+    URL of the target to be scanned
     """
     targetUrl: String!
   ): DastSiteValidation
 
+  """
+  DAST Site Validations associated with the project. Will always return no nodes
+  if `security_on_demand_scans_site_validation` is disabled
+  """
+  dastSiteValidations(
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
+    before: String
+
+    """
+    Returns the first _n_ elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last _n_ elements from the list.
+    """
+    last: Int
+
+    """
+    Normalized URL of the target to be scanned
+    """
+    normalizedTargetUrls: [String!]
+  ): DastSiteValidationConnection
+
   """
   Short description of the project
   """

doc/api/graphql/reference/gitlab_schema.json

@@ -14941,6 +14941,73 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "DastSiteValidationConnection",
+          "description": "The connection type for DastSiteValidation.",
+          "fields": [
+            {
+              "name": "edges",
+              "description": "A list of edges.",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "DastSiteValidationEdge",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "nodes",
+              "description": "A list of nodes.",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "DastSiteValidation",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "pageInfo",
+              "description": "Information to aid in pagination.",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "PageInfo",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "INPUT_OBJECT",
           "name": "DastSiteValidationCreateInput",
@@ -15095,6 +15162,51 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "DastSiteValidationEdge",
+          "description": "An edge in a connection.",
+          "fields": [
+            {
+              "name": "cursor",
+              "description": "A cursor for use in pagination.",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "node",
+              "description": "The item at the end of the edge.",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "DastSiteValidation",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "SCALAR",
           "name": "DastSiteValidationID",
@@ -47218,11 +47330,29 @@
             },
             {
               "name": "dastSiteValidation",
-              "description": "DAST Site Validation associated with the project",
+              "description": "DAST Site Validation associated with the project. Will always return `null` if `security_on_demand_scans_site_validation` is disabled",
               "args": [
+                {
+                  "name": "normalizedTargetUrls",
+                  "description": "Normalized URL of the target to be scanned",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
                 {
                   "name": "targetUrl",
-                  "description": "target URL of the DAST Site Validation",
+                  "description": "URL of the target to be scanned",
                   "type": {
                     "kind": "NON_NULL",
                     "name": null,
@@ -47243,6 +47373,77 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "dastSiteValidations",
+              "description": "DAST Site Validations associated with the project. Will always return no nodes if `security_on_demand_scans_site_validation` is disabled",
+              "args": [
+                {
+                  "name": "normalizedTargetUrls",
+                  "description": "Normalized URL of the target to be scanned",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "SCALAR",
+                        "name": "String",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                },
+                {
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
+                  "type": {
+                    "kind": "SCALAR",
+                    "name": "Int",
+                    "ofType": null
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "DastSiteValidationConnection",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "description",
               "description": "Short description of the project",

doc/api/graphql/reference/index.md

@@ -2454,7 +2454,8 @@ Autogenerated return type of PipelineRetry.
 | `dastScannerProfiles` | DastScannerProfileConnection | The DAST scanner profiles associated with the project |
 | `dastSiteProfile` | DastSiteProfile | DAST Site Profile associated with the project |
 | `dastSiteProfiles` | DastSiteProfileConnection | DAST Site Profiles associated with the project |
-| `dastSiteValidation` | DastSiteValidation | DAST Site Validation associated with the project |
+| `dastSiteValidation` | DastSiteValidation | DAST Site Validation associated with the project. Will always return `null` if `security_on_demand_scans_site_validation` is disabled |
+| `dastSiteValidations` | DastSiteValidationConnection | DAST Site Validations associated with the project. Will always return no nodes if `security_on_demand_scans_site_validation` is disabled |
 | `description` | String | Short description of the project |
 | `descriptionHtml` | String | The GitLab Flavored Markdown rendering of `description` |
 | `environment` | Environment | A single environment of the project |

ee/app/graphql/ee/types/project_type.rb

@@ -80,10 +80,16 @@ module EE
         field :dast_site_validation,
               ::Types::DastSiteValidationType,
               null: true,
+              resolver: ::Resolvers::DastSiteValidationResolver.single,
+              description: 'DAST Site Validation associated with the project. Will always return `null` ' \
+                           'if `security_on_demand_scans_site_validation` is disabled'
+
+        field :dast_site_validations,
+              ::Types::DastSiteValidationType.connection_type,
+              null: true,
               resolver: ::Resolvers::DastSiteValidationResolver,
-              description: 'DAST Site Validation associated with the project' do
-                argument :target_url, GraphQL::STRING_TYPE, required: true, description: 'target URL of the DAST Site Validation'
-              end
+              description: 'DAST Site Validations associated with the project. Will always return no nodes ' \
+                           'if `security_on_demand_scans_site_validation` is disabled'
 
         field :cluster_agent,
               ::Types::Clusters::AgentType,

ee/app/graphql/resolvers/dast_site_validation_resolver.rb

@@ -6,13 +6,30 @@ module Resolvers
 
     type Types::DastSiteValidationType.connection_type, null: true
 
+    argument :normalized_target_urls, [GraphQL::STRING_TYPE], required: false,
+             description: 'Normalized URL of the target to be scanned'
+
+    when_single do
+      argument :target_url, GraphQL::STRING_TYPE, required: true,
+               description: 'URL of the target to be scanned'
+    end
+
     def resolve(**args)
-      unless ::Feature.enabled?(:security_on_demand_scans_site_validation, project)
-        raise ::Gitlab::Graphql::Errors::ResourceNotAvailable, 'Feature disabled'
+      return DastSiteValidation.none unless allowed?
+
+      DastSiteValidationsFinder.new(project_id: project.id, url_base: url_base(args)).execute
     end
 
-      url_base = DastSiteValidation.get_normalized_url_base(args[:target_url])
-      DastSiteValidationsFinder.new(project_id: project.id, url_base: url_base).execute.first
+    private
+
+    def allowed?
+      ::Feature.enabled?(:security_on_demand_scans_site_validation, project)
+    end
+
+    def url_base(args)
+      return DastSiteValidation.get_normalized_url_base(args[:target_url]) if args[:target_url]
+
+      args[:normalized_target_urls]
     end
   end
 end

ee/spec/graphql/resolvers/dast_site_validation_resolver_spec.rb

@@ -8,10 +8,12 @@ RSpec.describe Resolvers::DastSiteValidationResolver do
   let_it_be(:target_url) { generate(:url) }
   let_it_be(:current_user) { create(:user) }
   let_it_be(:project) { create(:project) }
-  let_it_be(:dast_site_token) { create(:dast_site_token, project: project, url: target_url) }
-  let_it_be(:dast_site_validation) { create(:dast_site_validation, dast_site_token: dast_site_token) }
-
-  subject { sync(resolve_dast_site_validations(target_url: target_url)) }
+  let_it_be(:dast_site_token1) { create(:dast_site_token, project: project, url: target_url) }
+  let_it_be(:dast_site_validation1) { create(:dast_site_validation, dast_site_token: dast_site_token1) }
+  let_it_be(:dast_site_token2) { create(:dast_site_token, project: project, url: generate(:url)) }
+  let_it_be(:dast_site_validation2) { create(:dast_site_validation, dast_site_token: dast_site_token2) }
+  let_it_be(:dast_site_token3) { create(:dast_site_token, project: project, url: generate(:url)) }
+  let_it_be(:dast_site_validation3) { create(:dast_site_validation, dast_site_token: dast_site_token3) }
 
   before do
     project.add_maintainer(current_user)
@@ -21,13 +23,42 @@ RSpec.describe Resolvers::DastSiteValidationResolver do
     expect(described_class).to have_nullable_graphql_type(Types::DastSiteValidationType.connection_type)
   end
 
-  it 'returns DAST site validation' do
-    is_expected.to eq(dast_site_validation)
+  subject { sync(resolver) }
+
+  context 'when resolving a single DAST site validation' do
+    let(:resolver) { dast_site_validations(target_url: target_url) }
+
+    it { is_expected.to contain_exactly(dast_site_validation1) }
+  end
+
+  context 'when resolving multiple DAST site validations' do
+    let(:args) { {} }
+    let(:resolver) { dast_site_validations(args) }
+
+    it { is_expected.to contain_exactly(dast_site_validation3, dast_site_validation2, dast_site_validation1) }
+
+    context 'when multiple normalized_target_urls are specified' do
+      let(:args) { { normalized_target_urls: [dast_site_validation1.url_base, dast_site_validation3.url_base] } }
+
+      it { is_expected.to contain_exactly(dast_site_validation3, dast_site_validation1) }
+    end
+
+    context 'when one normalized_target_urls is specified' do
+      let(:args) { { normalized_target_urls: [dast_site_validation2.url_base] } }
+
+      it { is_expected.to contain_exactly(dast_site_validation2) }
+    end
+
+    context 'when an empty array is specified' do
+      let(:args) { { normalized_target_urls: [] } }
+
+      it { is_expected.to be_empty }
+    end
   end
 
   private
 
-  def resolve_dast_site_validations(args = {}, context = { current_user: current_user })
+  def dast_site_validations(args = {}, context = { current_user: current_user })
     resolve(described_class, obj: project, args: args, ctx: context)
   end
 end

ee/spec/requests/api/graphql/project/dast_site_validation_spec.rb

@@ -65,9 +65,8 @@ RSpec.describe 'Query.project(fullPath).dastSiteValidation' do
         stub_feature_flags(security_on_demand_scans_site_validation: false)
       end
 
-      it 'returns populated edges array' do
-        subject
-        expect(graphql_errors.first['message']).to eq("Feature disabled")
+      it 'returns a null dast_site_validation' do
+        expect(dast_site_validation_response).to be_nil
       end
     end
 

ee/spec/requests/api/graphql/project/dast_site_validations_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Query.project(fullPath).dastSiteValidations' do
+  include GraphqlHelpers
+
+  let_it_be(:project) { create(:project) }
+  let_it_be(:dast_site_token) { create(:dast_site_token, project: project, url: generate(:url)) }
+  let_it_be(:dast_site_validation1) { create(:dast_site_validation, dast_site_token: dast_site_token) }
+  let_it_be(:dast_site_validation2) { create(:dast_site_validation, dast_site_token: dast_site_token) }
+  let_it_be(:dast_site_validation3) { create(:dast_site_validation, dast_site_token: dast_site_token) }
+  let_it_be(:dast_site_validation4) { create(:dast_site_validation, dast_site_token: dast_site_token) }
+  let_it_be(:current_user) { create(:user) }
+
+  let(:query) do
+    fields = all_graphql_fields_for('DastSiteValidation')
+
+    graphql_query_for(
+      'project',
+      { 'fullPath' => project.full_path },
+      query_graphql_field('dastSiteValidations', 'first: 3', "edges { node { #{fields} } }")
+    )
+  end
+
+  let(:project_response) { subject['project'] }
+  let(:dast_site_validations_response) { project_response&.[]('dastSiteValidations') }
+  let(:edges) { dast_site_validations_response&.[]('edges') }
+
+  subject do
+    post_graphql(
+      query,
+      current_user: current_user,
+      variables: {
+        fullPath: project.full_path
+      }
+    )
+    graphql_data
+  end
+
+  before do
+    stub_licensed_features(security_on_demand_scans: true)
+  end
+
+  context 'when a user does not have access to the project' do
+    it 'returns a null project' do
+      expect(project_response).to be_nil
+    end
+  end
+
+  context 'when a user does not have access to dast_site_validations' do
+    it 'returns an empty edges array' do
+      project.add_guest(current_user)
+
+      expect(edges).to be_empty
+    end
+  end
+
+  context 'when a user has access to dast_site_validations' do
+    before do
+      project.add_developer(current_user)
+    end
+
+    let(:expected_results) do
+      [
+        dast_site_validation4,
+        dast_site_validation3,
+        dast_site_validation2
+      ].map { |validation| global_id_of(validation)}
+    end
+
+    it 'returns a populated edges array containing the correct dast_site_validations' do
+      results = edges.map { |edge| edge['node']['id'] }
+
+      expect(results).to eq(expected_results)
+    end
+  end
+end