Issv3 hub peripherals list add

java/code/src/com/redhat/rhn/common/conf/Config.java

@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024 SUSE LLC
  * Copyright (c) 2009--2014 Red Hat, Inc.
  *
  * This software is licensed to you under the GNU General Public License,
@@ -282,6 +283,36 @@ public Integer getInteger(String s) {
         return Integer.valueOf(val);
     }
 
+    /**
+     * get the config entry for string s, if no value is found
+     * return the defaultValue specified.
+     *
+     * @param s string to get the value of
+     * @param defaultValue Default value if entry is not found.
+     * @return the value
+     */
+    public long getLong(String s, long defaultValue) {
+        Long val = getLong(s);
+        if (val == null) {
+            return defaultValue;
+        }
+        return val;
+    }
+
+    /**
+     * get the config entry for string s
+     *
+     * @param s string to get the value of
+     * @return the value
+     */
+    public Long getLong(String s) {
+        String val = getString(s);
+        if (val == null) {
+            return null;
+        }
+        return Long.valueOf(val);
+    }
+
     /**
      * get the config entry for string s
      *

java/code/src/com/redhat/rhn/common/hibernate/AnnotationRegistry.java

@@ -1,16 +1,12 @@
 /*
- * Copyright (c) 2018 SUSE LLC
+ * Copyright (c) 2018--2025 SUSE LLC
  *
  * This software is licensed to you under the GNU General Public License,
  * version 2 (GPLv2). There is NO WARRANTY for this software, express or
  * implied, including the implied warranties of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
  * along with this software; if not, see
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * Red Hat trademarks are not licensed under GPLv2. No permission is
- * granted to use or replicate Red Hat trademarks that are incorporated
- * in this software or its documentation.
  */
 package com.redhat.rhn.common.hibernate;
 
@@ -55,6 +51,7 @@
 import com.redhat.rhn.domain.contentmgmt.SoftwareProjectSource;
 import com.redhat.rhn.domain.credentials.BaseCredentials;
 import com.redhat.rhn.domain.credentials.CloudRMTCredentials;
+import com.redhat.rhn.domain.credentials.HubSCCCredentials;
 import com.redhat.rhn.domain.credentials.RHUICredentials;
 import com.redhat.rhn.domain.credentials.RegistryCredentials;
 import com.redhat.rhn.domain.credentials.ReportDBCredentials;
@@ -168,6 +165,10 @@
 import com.suse.manager.model.attestation.CoCoResultTypeConverter;
 import com.suse.manager.model.attestation.ServerCoCoAttestationConfig;
 import com.suse.manager.model.attestation.ServerCoCoAttestationReport;
+import com.suse.manager.model.hub.IssAccessToken;
+import com.suse.manager.model.hub.IssHub;
+import com.suse.manager.model.hub.IssPeripheral;
+import com.suse.manager.model.hub.IssPeripheralChannels;
 import com.suse.manager.model.maintenance.MaintenanceCalendar;
 import com.suse.manager.model.maintenance.MaintenanceSchedule;
 
@@ -226,6 +227,7 @@ private AnnotationRegistry() {
             EnvironmentTarget.class,
             ErrataFilter.class,
             GroupRecurringAction.class,
+            HubSCCCredentials.class,
             ImageFile.class,
             ImageInfo.class,
             ImageInfoCustomDataValue.class,
@@ -241,7 +243,11 @@ private AnnotationRegistry() {
             InstalledPackage.class,
             InternalState.class,
             InventoryPath.class,
+            IssAccessToken.class,
+            IssHub.class,
             IssMaster.class,
+            IssPeripheral.class,
+            IssPeripheralChannels.class,
             KiwiProfile.class,
             MaintenanceCalendar.class,
             MaintenanceSchedule.class,

java/code/src/com/redhat/rhn/common/util/http/HttpClientAdapter.java

@@ -1,22 +1,19 @@
 /*
- * Copyright (c) 2015 SUSE LLC
+ * Copyright (c) 2015--2024 SUSE LLC
  *
  * This software is licensed to you under the GNU General Public License,
  * version 2 (GPLv2). There is NO WARRANTY for this software, express or
  * implied, including the implied warranties of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
  * along with this software; if not, see
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * Red Hat trademarks are not licensed under GPLv2. No permission is
- * granted to use or replicate Red Hat trademarks that are incorporated
- * in this software or its documentation.
  */
 package com.redhat.rhn.common.util.http;
 
 import com.redhat.rhn.common.conf.Config;
 import com.redhat.rhn.common.conf.ConfigDefaults;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpException;
 import org.apache.http.HttpHost;
@@ -34,6 +31,8 @@
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.conn.routing.HttpRoute;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.cookie.Cookie;
+import org.apache.http.impl.client.BasicCookieStore;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.ProxyAuthenticationStrategy;
@@ -49,9 +48,11 @@
 import java.net.URI;
 import java.security.KeyStore;
 import java.security.NoSuchAlgorithmException;
+import java.security.cert.Certificate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 import javax.net.ssl.SSLContext;
@@ -101,14 +102,41 @@ public class HttpClientAdapter {
 
     /** The credentials provider. */
     private final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+
+    /**
+     * The cookie store
+     */
+    private BasicCookieStore cookieStore;
+
     /**
      * Initialize an {@link HttpClient} for performing requests. Proxy settings will
-     * be read from the configuration and applied transparently.
+     * be read from the configuration and applied transparently. The cookies will not be supported.
      */
     public HttpClientAdapter() {
+        this(List.of(), false);
+    }
+
+    /**
+     * Initialize an {@link HttpClient} for performing requests. Proxy settings will
+     * be read from the configuration and applied transparently. The cookies will not be supported.
+     *
+     * @param additionalCertificates a list of additional certificate to consider when establishing the connection
+     */
+    public HttpClientAdapter(List<Certificate> additionalCertificates) {
+        this(additionalCertificates, false);
+    }
+
+    /**
+     * Initialize an {@link HttpClient} for performing requests. Proxy settings will
+     * be read from the configuration and applied transparently.
+     *
+     * @param allowCookies true, to allow and use cookies.
+     * @param additionalCertificates a list of additional certificate to consider when establishing the connection
+     */
+    public HttpClientAdapter(List<Certificate> additionalCertificates, boolean allowCookies) {
         Optional<SSLConnectionSocketFactory> sslSocketFactory = Optional.empty();
         try {
-            SSLContext sslContext = buildSslSocketContext();
+            SSLContext sslContext = buildSslSocketContext(additionalCertificates);
             List<String> supportedProtocols = Arrays.asList(sslContext.getSupportedSSLParameters().getProtocols());
             List<String> wantedProtocols = Arrays.asList("TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3");
             wantedProtocols.retainAll(supportedProtocols);
@@ -129,7 +157,7 @@ public HttpClientAdapter() {
         Builder requestConfigBuilder = RequestConfig.custom()
                 .setConnectTimeout(HttpClientAdapter.getHTTPConnectionTimeout(5))
                 .setSocketTimeout(HttpClientAdapter.getHTTPSocketTimeout(5 * 60))
-                .setCookieSpec(CookieSpecs.IGNORE_COOKIES);
+                .setCookieSpec(allowCookies ? CookieSpecs.STANDARD : CookieSpecs.IGNORE_COOKIES);
 
         // Store the proxy settings
         String proxyHostname = ConfigDefaults.get().getProxyHost();
@@ -170,22 +198,36 @@ public HttpClientAdapter() {
         requestConfig = requestConfigBuilder.build();
         clientBuilder.setMaxConnPerRoute(Config.get().getInt(MAX_CONNCECTIONS, 1));
         clientBuilder.setMaxConnTotal(Config.get().getInt(MAX_CONNCECTIONS, 1));
+        if (allowCookies) {
+            cookieStore = new BasicCookieStore();
+            clientBuilder.setDefaultCookieStore(cookieStore);
+        }
+
         httpClient = clientBuilder.build();
     }
 
-    private SSLContext buildSslSocketContext() throws NoSuchAlgorithmException {
+    private SSLContext buildSslSocketContext(List<Certificate> additionalCertificates) throws NoSuchAlgorithmException {
 
         LOG.info("Started checking for certificates and if it finds the certificates will be loaded...");
 
-        String keyStoreLoc = System.getProperty("javax.net.ssl.trustStore",
-                System.getProperty("java.home") + "/lib/security/cacerts");
+        String defaultLocation = System.getProperty("java.home") + "/lib/security/cacerts";
+        String keyStoreLoc = System.getProperty("javax.net.ssl.trustStore", defaultLocation);
+
         SSLContext context;
 
         try (InputStream in = new FileInputStream(keyStoreLoc)) {
             // Create a KeyStore containing our trusted CAs
             KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType());
             keystore.load(in, null);
 
+            // Add any additional certificate to the store, if specified
+            if (CollectionUtils.isNotEmpty(additionalCertificates)) {
+                int customCert = 0;
+                for (Certificate certificate : additionalCertificates) {
+                    keystore.setCertificateEntry("additional_certificate_" + customCert++, certificate);
+                }
+            }
+
             // Create a TrustManager that trusts the CAs in our KeyStore
             String tmfAlgorithm = TrustManagerFactory.getDefaultAlgorithm();
             TrustManagerFactory tmf = TrustManagerFactory.getInstance(tmfAlgorithm);
@@ -327,6 +369,25 @@ public HttpResponse executeRequest(HttpRequestBase request, String username,
         return executeRequest(request, ignoreNoProxy);
     }
 
+    /**
+     * Set the value of a cookie
+     * @param cookie the cookie
+     */
+    public void setCookie(Cookie cookie) {
+        cookieStore.addCookie(cookie);
+    }
+
+    /**
+     * Retrieves the cookies with the specified name from the cookie store.
+     * @param name the name of the cookie to retrieve
+     * @return the cookie with a matching name.
+     */
+    public List<Cookie> getCookies(String name) {
+        return cookieStore.getCookies().stream()
+            .filter(cookie -> Objects.equals(name, cookie.getName()))
+            .toList();
+    }
+
     /**
      * Check for a given {@link URI} if a proxy should be used or not.
      *

java/code/src/com/redhat/rhn/domain/errata/CustomEnumType.java → java/code/src/com/redhat/rhn/domain/CustomEnumType.java

@@ -1,18 +1,14 @@
 /*
- * Copyright (c) 2021 SUSE LLC
+ * Copyright (c) 2021--2024 SUSE LLC
  *
  * This software is licensed to you under the GNU General Public License,
  * version 2 (GPLv2). There is NO WARRANTY for this software, express or
  * implied, including the implied warranties of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
  * along with this software; if not, see
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * Red Hat trademarks are not licensed under GPLv2. No permission is
- * granted to use or replicate Red Hat trademarks that are incorporated
- * in this software or its documentation.
  */
-package com.redhat.rhn.domain.errata;
+package com.redhat.rhn.domain;
 
 import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;

java/code/src/com/redhat/rhn/domain/DatabaseEnumType.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2024--2025 SUSE LLC
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ */
+
+package com.redhat.rhn.domain;
+
+import java.sql.Types;
+import java.util.Arrays;
+import java.util.Objects;
+
+/**
+ * A {@link CustomEnumType} that maps a Java enum to a PostgreSQL enum type.
+ *
+ * <p>This type handles the conversion between Java enum values and their corresponding
+ * string representations in the PostgreSQL database.
+ *
+ * <p>If the enum type implements the {@link Labeled} interface, the
+ * {@link Labeled#getLabel()} method is used to obtain the value stored in the database.
+ * Otherwise, the standard {@link Enum#name()} method is called.
+ *
+ * @param <T> the type of the enum
+ */
+public abstract class DatabaseEnumType<T extends Enum<T>> extends CustomEnumType<T, String> {
+
+    /**
+     * Construct an instance for the specified enum class.
+     *
+     * @param enumClassIn the enum class
+     */
+    protected DatabaseEnumType(Class<T> enumClassIn) {
+        super(enumClassIn, String.class, e -> getLabel(e), v -> findByLabel(enumClassIn, v));
+    }
+
+    // Converts the given enum constant to the string representation used in the database.
+    private static <T extends Enum<T>> String getLabel(T value) {
+        if (value instanceof Labeled labeled) {
+            return labeled.getLabel();
+        }
+
+        return value.name();
+    }
+
+    /**
+     * Converts a string value from the database to the proper enum value.
+     * @param enumType the class of the enum
+     * @param label the database value
+     * @return an instance of the specified enum
+     * @param <T> the enum
+      */
+    public static <T extends Enum<T>> T findByLabel(Class<T> enumType, String label) {
+        return Arrays.stream(enumType.getEnumConstants())
+            .filter(e -> Objects.equals(label, getLabel(e)))
+            .findFirst()
+            .orElseThrow(
+                () -> new IllegalArgumentException("Invalid %s value %s".formatted(enumType.getName(), label))
+            );
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * @returns {@link Types#OTHER}, as this instance is mapping the enum values to a PostgreSQL enum.
+     */
+    @Override
+    public int getSqlType() {
+        return Types.OTHER;
+    }
+}

java/code/src/com/redhat/rhn/domain/Label.java

@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024 SUSE LLC
  * Copyright (c) 2009--2010 Red Hat, Inc.
  *
  * This software is licensed to you under the GNU General Public License,
@@ -45,7 +46,7 @@
  * @see com.redhat.rhn.domain.server.VirtualInstanceType
  *
  */
-public abstract class Label {
+public abstract class Label implements Labeled {
 
     private Long id;
     private String name;
@@ -84,6 +85,7 @@ private void setName(String newName) {
      *
      * @return The label text of this label
      */
+    @Override
     public String getLabel() {
         return label;
     }