pom.xml

@@ -12,7 +12,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-    <quarkus.platform.version>3.1.3.Final</quarkus.platform.version>
+    <quarkus.platform.version>3.1.2.Final</quarkus.platform.version>
     <skipITs>true</skipITs>
     <surefire-plugin.version>3.0.0</surefire-plugin.version>
   </properties>
@@ -87,24 +87,6 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-kubernetes-config</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.pnc</groupId>
-      <artifactId>common</artifactId>
-      <version>2.5.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.pnc</groupId>
-      <artifactId>rest-client</artifactId>
-      <version>2.5.1</version>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-rest-client-reactive-jackson</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-rest-client-reactive</artifactId>
-    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-junit5</artifactId>

src/main/java/com/redhat/pctsec/model/Git.java

@@ -12,7 +12,7 @@ import java.util.UUID;
 @Entity
 public class Git {
     public Git() {
-
+        super();
     }
 
     @Id

src/main/java/com/redhat/pctsec/model/PNCBuild.java

@@ -1,50 +1,15 @@
 package com.redhat.pctsec.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.redhat.pctsec.model.api.service.AltPncService;
-//import com.redhat.pctsec.model.api.service.PncService;
-import io.quarkus.rest.client.reactive.QuarkusRestClientBuilder;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
 import jakarta.persistence.Entity;
-import jakarta.persistence.Transient;
-import org.eclipse.microprofile.config.ConfigProvider;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.jboss.pnc.dto.Build;
 
 import java.net.URI;
 import java.net.URL;
 
 @Entity
 public class PNCBuild extends BuildType{
-
-
-    @Transient
-    public static final String apiUrl = ConfigProvider.getConfig().getValue("pnc.api-url",String.class);
-    @Transient
-    private static final AltPncService pnc = QuarkusRestClientBuilder.newBuilder().baseUri(URI.create(apiUrl)).build(AltPncService.class);
-
-
-    /*
-    @Transient
-    PncService pnc;
-    */
-
-    @Transient
-    @JsonIgnore
-    private Build build;
-
-    private URI SCMURL;
-    private String revision;
-
     public PNCBuild() {
         super();
     }
-    public Build getBuild() {
-        if(build == null)
-            build = pnc.getBuild(this.buildRef);
-        return build;
-    }
 
     public PNCBuild(String buildRef) {
         super(buildRef);
@@ -52,10 +17,7 @@ public class PNCBuild extends BuildType{
 
     @Override
     public URI SCMURL() {
-        if(SCMURL == null)
-            SCMURL = URI.create(getBuild().getScmUrl());
-
-        return this.SCMURL;
+        return null;
     }
 
     @Override
@@ -65,9 +27,7 @@ public class PNCBuild extends BuildType{
 
     @Override
     public String revision() {
-        if(revision == null)
-            revision = getBuild().getScmTag();
-        return revision;
+        return null;
     }
 
     public static boolean isValidRef(String ref){

src/main/java/com/redhat/pctsec/model/Scan.java

@@ -1,7 +1,6 @@
 package com.redhat.pctsec.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.*;
 import jakarta.transaction.Transactional;
 import jakarta.validation.constraints.Email;
@@ -18,50 +17,6 @@ enum ScanState {
 @Entity
 public class Scan {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    public UUID id;
-
-
-    /*
-    @OneToOne
-    @NotNull
-    @JoinColumn(name = "product_id", referencedColumnName = "id")
-    private String productName;
-    */
-    @Column(name="proudct_name")
-    private String productName;
-
-    //@Temporal(TemporalType.TIMESTAMP)
-
-    @CreationTimestamp
-    @JsonIgnore
-    @Column(name="creation_timestamp")
-    //@NotNull
-    private Instant creationTimestamp;
-
-    @UpdateTimestamp
-    @JsonIgnore
-    @Column(name="update_timestamp")
-    //@NotNull
-    private Instant updateTimestamp;
-
-    @Column(name="state")
-    @Enumerated(EnumType.STRING)
-    private ScanState state;
-
-    @Column(name="requestor")
-    @NotNull
-    private String requestor;
-
-    @Column(name="report_email")
-    @Email
-    private String email;
-
-    @OneToOne(cascade = CascadeType.ALL, fetch=FetchType.EAGER)
-    @JoinColumn(name = "scan_requests_id", referencedColumnName = "id")
-    public ScanRequests scanRequests = new ScanRequests();
-
     public Scan() {
         this.scanRequests = new ScanRequests();
     }
@@ -98,13 +53,8 @@ public class Scan {
         this.requestor = requestor;
     }
 
-    @JsonProperty("email")
-    @Access(AccessType.PROPERTY)
-    @Email
     public String getEmail() {
-        if(email != null)
-            return email;
-        return getRequestor() + "@redhat.com";
+        return email;
     }
 
     public void setEmail(String email) {
@@ -119,4 +69,48 @@ public class Scan {
     public void setScanRequests(ScanRequests scanRequests) {
         this.scanRequests = scanRequests;
     }
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    public UUID id;
+
+
+    /*
+    @OneToOne
+    @NotNull
+    @JoinColumn(name = "product_id", referencedColumnName = "id")
+    private String productName;
+    */
+    @Column(name="proudct_name")
+    private String productName;
+
+    //@Temporal(TemporalType.TIMESTAMP)
+
+    @CreationTimestamp
+    @JsonIgnore
+    @Column(name="creation_timestamp")
+    //@NotNull
+    private Instant creationTimestamp;
+
+    @UpdateTimestamp
+    @JsonIgnore
+    @Column(name="update_timestamp")
+    //@NotNull
+    private Instant updateTimestamp;
+
+    @Column(name="state")
+    @Enumerated(EnumType.STRING)
+    private ScanState state;
+
+    @Column(name="requestor")
+    @NotNull
+    private String requestor;
+
+    @Column(name="report_email")
+    @Email
+    private String email;
+
+    @OneToOne(cascade = CascadeType.ALL, fetch=FetchType.LAZY)
+    @JoinColumn(name = "scan_requests_id", referencedColumnName = "id")
+    public ScanRequests scanRequests;
 }

src/main/java/com/redhat/pctsec/model/ScanRequest.java

@@ -43,17 +43,17 @@ public class ScanRequest {
 
     private RequestType type;
 
-    @OneToOne(fetch=FetchType.EAGER, cascade = CascadeType.ALL)
+    @OneToOne(fetch=FetchType.LAZY, cascade = CascadeType.ALL)
     @JoinColumn(name = "brew_build_id", referencedColumnName = "id")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public BrewBuild brewBuild;
 
-    @OneToOne(fetch=FetchType.EAGER, cascade = CascadeType.ALL)
+    @OneToOne(fetch=FetchType.LAZY, cascade = CascadeType.ALL)
     @JoinColumn(name = "pnc_build_id", referencedColumnName = "id")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public PNCBuild pncBuild;
 
-    @OneToOne(fetch=FetchType.EAGER, cascade = CascadeType.ALL)
+    @OneToOne(fetch=FetchType.LAZY, cascade = CascadeType.ALL)
     @JoinColumn(name = "git_id", referencedColumnName = "id")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public Git git;

src/main/java/com/redhat/pctsec/model/ScanRequests.java

@@ -1,7 +1,5 @@
 package com.redhat.pctsec.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.redhat.pctsec.model.api.request.pssaas;
 import com.redhat.pctsec.model.api.request.scanChain;
 import io.vertx.mutiny.core.eventbus.EventBus;
@@ -11,8 +9,6 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import jakarta.persistence.*;
-import jakarta.transaction.Transactional;
-import org.jboss.logging.annotations.Property;
 
 @ApplicationScoped
 @Entity
@@ -23,19 +19,15 @@ public class ScanRequests {
     @GeneratedValue
     protected UUID id;
 
-
-
     @OneToMany(fetch=FetchType.EAGER, cascade = CascadeType.ALL)
     @JoinColumn(name = "scan_request_id", referencedColumnName = "id")
-    public Set<ScanRequest> scanRequests = new HashSet<>();
+    private Set<ScanRequest> scanRequests;// = new HashSet<>();
 
 
     @Column(name="scan_properties")
-    @JsonIgnore
     private String globalScanProperties;
 
     @Column(name="scan_metadata")
-    @JsonIgnore
     private String scanMetadata;
 
 
@@ -52,11 +44,8 @@ public class ScanRequests {
         pssaas.componentList.stream().filter(c -> c.getType().equals("pnc")).forEach(g -> this.addPNCBuild(g.getBuildId()));
     }
 
-
-    public ScanRequests(scanChain scanChain){
-
+    public ScanRequests(scanChain scanchain){
         this();
-        scanChain.urls.stream().forEach(g -> this.addGit(g.getRepo().toString(), g.getRef()));
     }
 
     //public ScanRequests(String repo, String rev){
@@ -96,14 +85,14 @@ public class ScanRequests {
          */
     }
 
-
+    public Set<ScanRequest> getScanRequests() {
+        return scanRequests;
+    }
 
     public void setScanRequests(Set<ScanRequest> scanRequests) {
         this.scanRequests = scanRequests;
     }
 
-    @JsonProperty("globalScanProperties")
-    @Transient
     public String getGlobalScanProperties() {
         return globalScanProperties;
     }
@@ -112,9 +101,6 @@ public class ScanRequests {
         this.globalScanProperties = globalScanProperties;
     }
 
-
-    @JsonProperty("scanMetadata")
-    @Transient
     public String getScanMetadata() {
         return scanMetadata;
     }
@@ -122,10 +108,4 @@ public class ScanRequests {
     public void setScanMetadata(String scanMetadata) {
         this.scanMetadata = scanMetadata;
     }
-
-    @JsonProperty("scanRequests")
-    @Transient
-    public Set<ScanRequest> getScanRequests() {
-        return this.scanRequests;
-    }
 }

src/main/java/com/redhat/pctsec/model/api/request/scanChain.java

@@ -1,35 +1,4 @@
 package com.redhat.pctsec.model.api.request;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-import java.util.List;
-import java.util.Set;
-
-
 public class scanChain {
-
-    @JsonProperty("product_name")
-    @JsonPropertyDescription("The product name associated with the scan.")
-    @NotNull
-    public String productName;
-
-    @JsonProperty("urls")
-    @JsonDeserialize(as = java.util.LinkedHashSet.class)
-    @JsonPropertyDescription("List of source urls to be scanned")
-    @Size(min = 1)
-    @Valid
-    @NotNull
-    public Set<scanChainGit> urls;
-
-    @JsonProperty("requestor")
-    @JsonPropertyDescription("The requesting user")
-    @NotNull
-    public String requestor;
 }
-

src/main/java/com/redhat/pctsec/model/api/request/scanChainGit.java

@@ -1,34 +0,0 @@
-package com.redhat.pctsec.model.api.request;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.NotNull;
-
-import java.net.URI;
-
-
-public class scanChainGit {
-
-
-    private URI repo;
-    private String ref;
-    public scanChainGit(@NotNull URI repo, @NotNull String ref) {
-        this.repo = repo;
-        this.ref = ref;
-    }
-
-
-    @NotNull
-    @JsonProperty("url")
-    public URI getRepo() {
-        return this.repo;
-    }
-
-    @NotNull
-    @JsonProperty("branch")
-        public String getRef() {
-
-        return this.ref;
-    }
-
-}

src/main/java/com/redhat/pctsec/model/api/service/AltPncService.java

@@ -1,12 +0,0 @@
-package com.redhat.pctsec.model.api.service;
-import jakarta.ws.rs.*;
-import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
-import org.jboss.pnc.dto.Build;
-
-@Path("pnc-rest/v2/builds")
-@RegisterRestClient
-public interface AltPncService {
-    @GET
-    @Path("{id}")
-    Build getBuild(@PathParam("id") String id);
-}

src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanRequestsResource.java

@@ -9,7 +9,7 @@ import io.quarkus.security.Authenticated;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.*;
-//import org.jboss.resteasy.reactive.common.NotImplementedYet;
+import org.jboss.resteasy.reactive.common.NotImplementedYet;
 
 import java.util.UUID;
 
@@ -35,7 +35,7 @@ public class ScanRequestsResource {
     @Authenticated
     public ScanRequests addScanRequest(String id, ScanRequest scanRequest)
     {
-        throw new WebApplicationException("Not implemented");
+        throw new NotImplementedYet();
     }
 
 }

src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanResource.java

@@ -2,20 +2,16 @@ package com.redhat.pctsec.rest.v1alpha1;
 
 import com.redhat.pctsec.model.*;
 import com.redhat.pctsec.model.api.request.pssaas;
-import com.redhat.pctsec.model.api.request.scanChain;
 import com.redhat.pctsec.model.jpa.ScanRepository;
 import io.quarkus.security.Authenticated;
-import io.quarkus.security.identity.SecurityIdentity;
 import io.vertx.mutiny.core.eventbus.EventBus;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.Email;
 import jakarta.ws.rs.*;
 import org.jboss.resteasy.reactive.RestQuery;
 
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
@@ -31,10 +27,6 @@ public class ScanResource {
     @Inject
     EventBus bus;
 
-    @Inject
-    SecurityIdentity identity;
-
-
     @POST
     @Path("PSSaaS")
     @Consumes({ "application/json" })
@@ -44,12 +36,8 @@ public class ScanResource {
     {
         ScanRequests scanRequests = new ScanRequests(scanRequest);
         Scan s = new Scan();
-        s.setProductName(scanRequest.productId);
+        s.setRequestor("cpaas");
         s.setScanRequests(scanRequests);
-        if(!identity.getPrincipal().getName().isEmpty())
-            s.setRequestor(identity.getPrincipal().getName());
-        else
-            s.setRequestor("CPaaS");
         sr.persist(s);
         return s;
     }
@@ -64,37 +52,6 @@ public class ScanResource {
         return s.scanRequests.execute(bus);
     }
 
-    @POST
-    @Path("ScanChain")
-    @Consumes({ "application/json" })
-    @Transactional
-    @Authenticated
-    public Scan createScanChain(@Valid scanChain scanRequest)
-    {
-        ScanRequests scanRequests = new ScanRequests(scanRequest);
-        Scan s = new Scan();
-        //Set the requestor to kerberos uid first
-        if(!identity.getPrincipal().getName().isEmpty())
-            s.setRequestor(identity.getPrincipal().getName());
-        //Set the email to be our kerberos id + @redhat.com
-        s.setEmail(s.getEmail());
-        //Now set the actual payload requestor
-        s.setRequestor(scanRequest.requestor);
-        s.setProductName(scanRequest.productName);
-        s.setScanRequests(scanRequests);
-        sr.persist(s);
-        return s;
-    }
-    @POST
-    @Path("ScanChain/run")
-    @Consumes({ "application/json" })
-    @Transactional
-    @Authenticated
-    public List<ScanTask> createRunScanChain(@Valid scanChain scanRequest)
-    {
-        Scan s = this.createScanChain(scanRequest);
-        return s.scanRequests.execute(bus);
-    }
     @GET
     @Path("All")
     @Produces({"application/json"})
@@ -121,19 +78,6 @@ public class ScanResource {
         return s.scanRequests.execute(bus);
     }
 
-    @PATCH
-    @Path("{id}/{email}")
-    @Consumes({"application/octet-stream"})
-    @Produces({"application/json"})
-    @Authenticated
-    @Transactional
-    public Scan patchScanEmail(String id, @Email String email)
-    {
-        Scan s = sr.findById(UUID.fromString(id));
-        s.setEmail(email);
-        sr.persist(s);
-        return s;
-    }
 
     @GET
     @Path("single/git")
@@ -143,8 +87,7 @@ public class ScanResource {
     public Scan singleGit(@RestQuery String repo, @RestQuery String ref)
     {
         Scan s = new Scan();
-        if(!identity.getPrincipal().getName().isEmpty())
-            s.setRequestor(identity.getPrincipal().getName());
+        s.setRequestor("jochrist");
         s.getScanRequests().addGit(repo,ref);
         sr.persist(s);
         return s;
@@ -158,8 +101,7 @@ public class ScanResource {
     public Scan singleGit(@RestQuery String brewId)
     {
         Scan s = new Scan();
-        if(!identity.getPrincipal().getName().isEmpty())
-            s.setRequestor(identity.getPrincipal().getName());
+        s.setRequestor("jochrist");
         s.getScanRequests().addBrewBuild(brewId);
         sr.persist(s);
         return s;
@@ -172,8 +114,7 @@ public class ScanResource {
     public Scan singlePNC(@RestQuery String pncId)
     {
         Scan s = new Scan();
-        if(!identity.getPrincipal().getName().isEmpty())
-            s.setRequestor(identity.getPrincipal().getName());
+        s.setRequestor("jochrist");
         s.getScanRequests().addPNCBuild(pncId);
         sr.persist(s);
         return s;

src/main/resources/application.properties

@@ -57,7 +57,6 @@ quarkus.arc.remove-unused-beans=false
 %stage.quarkus.openshift.route.target-port=https
 %stage.quarkus.openshift.route.tls.insecure-edge-termination-policy=redirect
 %stage.quarkus.openshift.namespace=pct-security-tooling
-quarkus.openshift.namespace=pct-security-tooling
 
 ##########################################
 #   Kerberos Specifics                   #
@@ -81,10 +80,5 @@ tekton.pipeline.ref=osh-client-from-source
 tekton.task.ref=osh-scan-task
 tekton.service-account=${quarkus.openshift.service-account}
 
-##########################################
-#   PNC Settings                         #
-##########################################
-pnc.api-url=http://orch.psi.redhat.com
-
 
 

src/test/java/com/redhat/pctsec/model/osh/paramMapperTest.java

@@ -1,6 +1,5 @@
-package com.redhat.pctsec.model.test;
+package com.redhat.pctsec.model.osh;
 
-import com.redhat.pctsec.model.osh.paramMapper;
 import io.quarkus.test.junit.QuarkusTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;

src/test/java/com/redhat/pctsec/model/test/PNCBuildTest.java

@@ -1,19 +0,0 @@
-package com.redhat.pctsec.model.test;
-
-import com.redhat.pctsec.model.PNCBuild;
-import io.quarkus.test.junit.QuarkusTest;
-import jakarta.inject.Inject;
-import org.junit.jupiter.api.Test;
-
-@QuarkusTest
-public class PNCBuildTest {
-
-
-
-    @Test
-    public void testBuildFetch(){
-        PNCBuild pb = new PNCBuild("AZAQZSPFDRQAA");
-        System.out.println(pb.SCMURL());
-        System.out.println(pb.revision());
-    }
-}