build.gradle.kts

@@ -36,6 +36,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-jdbc")
     implementation("org.xerial:sqlite-jdbc")
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+    implementation("org.springframework.boot:spring-boot-starter-validation")
     implementation("org.hibernate.orm:hibernate-community-dialects")
 
 	implementation("org.springframework.boot:spring-boot-starter-security")

src/main/java/de/mlessmann/certassist/models/Certificate.java

@@ -0,0 +1,45 @@
+package de.mlessmann.certassist.models;
+
+import jakarta.persistence.*;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.Setter;
+
+@Entity
+@Data
+public class Certificate {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.UUID)
+    @Setter(AccessLevel.NONE)
+    private String id;
+
+    @NotNull
+    @Enumerated(EnumType.STRING)
+    private CertificateType type;
+
+    @NotNull
+    private String commonName;
+
+    private String trustingAuthority;
+
+    @Min(1)
+    private int requestedKeyLength;
+
+    @Min(1)
+    private int requestedValidityDays;
+
+    private String subjectEmailAddress;
+    private String subjectOrganization;
+    private String subjectOrganizationalUnit;
+    private String subjectCountry;
+    private String subjectState;
+    private String subjectLocality;
+
+    @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<CertificateExtension> certificateExtension = new ArrayList<>();
+}

src/main/java/de/mlessmann/certassist/models/CertificateExtension.java

@@ -0,0 +1,19 @@
+package de.mlessmann.certassist.models;
+
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.Setter;
+
+@Entity
+@Data
+public class CertificateExtension {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.UUID)
+    @Setter(AccessLevel.NONE)
+    private String id;
+
+    private String identifier;
+    private String value;
+}

src/main/java/de/mlessmann/certassist/models/CertificateSubjectPreset.java

@@ -0,0 +1,26 @@
+package de.mlessmann.certassist.models;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.Setter;
+
+@Entity
+@Data
+public class CertificateSubjectPreset {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.UUID)
+    @Setter(AccessLevel.NONE)
+    private String id;
+
+    private String emailAddress;
+    private String organization;
+    private String organizationalUnit;
+    private String country;
+    private String state;
+    private String locality;
+}

src/main/java/de/mlessmann/certassist/models/CertificateType.java

@@ -0,0 +1,8 @@
+package de.mlessmann.certassist.models;
+
+public enum CertificateType {
+    ROOT_CA,
+    STANDALONE_CERT,
+    SIGNED_CERT,
+    CLIENT_CERT,
+}

src/main/java/de/mlessmann/certassist/models/User.java

@@ -4,6 +4,7 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,8 +13,9 @@ import lombok.Setter;
 public class User {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    @GeneratedValue(strategy = GenerationType.UUID)
-    private Long id;
+    @Setter(AccessLevel.NONE)
+    private String id;
 
     @Setter
     private String username;

src/main/java/de/mlessmann/certassist/openssl/CertificateRequest.java

@@ -9,6 +9,7 @@ import lombok.Data;
 public class CertificateRequest {
 
     @Builder.Default
+    @Deprecated
     private String oid = UUID.randomUUID().toString();
 
     private RequestType type;

src/main/java/de/mlessmann/certassist/repositories/CertificateExtensionRepository.java

@@ -0,0 +1,8 @@
+package de.mlessmann.certassist.repositories;
+
+import de.mlessmann.certassist.models.CertificateExtension;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CertificateExtensionRepository extends CrudRepository<CertificateExtension, String> {}

src/main/java/de/mlessmann/certassist/repositories/CertificateRepository.java

@@ -0,0 +1,8 @@
+package de.mlessmann.certassist.repositories;
+
+import de.mlessmann.certassist.models.Certificate;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CertificateRepository extends CrudRepository<Certificate, String> {}

src/main/java/de/mlessmann/certassist/repositories/CertificateSubjectPresetRepository.java

@@ -0,0 +1,8 @@
+package de.mlessmann.certassist.repositories;
+
+import de.mlessmann.certassist.models.CertificateSubjectPreset;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CertificateSubjectPresetRepository extends CrudRepository<CertificateSubjectPreset, String> {}

src/main/java/de/mlessmann/certassist/repositories/UserRepository.java

@@ -5,7 +5,4 @@ import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface UserRepository extends CrudRepository<User, Long> {
+public interface UserRepository extends CrudRepository<User, String> {}
-
-    User findUserById(long id);
-}

src/test/java/de/mlessmann/certassist/repositories/CertificateExtensionRepositoryTest.java

@@ -0,0 +1,26 @@
+package de.mlessmann.certassist.repositories;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import de.mlessmann.certassist.models.CertificateExtension;
+import jakarta.transaction.Transactional;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class CertificateExtensionRepositoryTest {
+
+    @Autowired
+    private CertificateExtensionRepository repository;
+
+    @Test
+    @Transactional
+    void findCertificate() {
+        CertificateExtension certificateExtension = new CertificateExtension();
+        certificateExtension.setValue("test-value");
+        repository.save(certificateExtension);
+
+        assertThat(repository.findById(certificateExtension.getId()).orElseThrow().getValue()).isEqualTo("test-value");
+    }
+}

src/test/java/de/mlessmann/certassist/repositories/CertificateRepositoryTest.java

@@ -0,0 +1,58 @@
+package de.mlessmann.certassist.repositories;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import de.mlessmann.certassist.models.Certificate;
+import de.mlessmann.certassist.models.CertificateExtension;
+import de.mlessmann.certassist.models.CertificateType;
+import jakarta.transaction.Transactional;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class CertificateRepositoryTest {
+
+    @Autowired
+    private CertificateRepository repository;
+
+    @Autowired
+    private CertificateExtensionRepository extensionRepository;
+
+    private Certificate getCertificate() {
+        final Certificate certificate = new Certificate();
+        certificate.setCommonName("test-cn");
+        certificate.setType(CertificateType.SIGNED_CERT);
+        certificate.setRequestedKeyLength(1);
+        certificate.setRequestedValidityDays(1);
+
+        return certificate;
+    }
+
+    @Test
+    @Transactional
+    void findCertificate() {
+        final Certificate certificate = getCertificate();
+        repository.save(certificate);
+
+        Certificate foundCertificate = repository.findById(certificate.getId()).orElseThrow();
+        assertThat(foundCertificate.getCommonName()).isEqualTo("test-cn");
+        assertThat(foundCertificate.getType()).isEqualTo(CertificateType.SIGNED_CERT);
+    }
+
+    @Test
+    @Transactional
+    void findCertificateWithExtension() {
+        final Certificate certificate = getCertificate();
+        CertificateExtension extension = new CertificateExtension();
+        extension.setValue("test-ext-value");
+        certificate.setCertificateExtension(List.of(extension));
+        repository.save(certificate);
+
+        assertThat(repository.findById(certificate.getId()).orElseThrow().getCertificateExtension()).hasSize(1);
+        assertThat(extensionRepository.findAll())
+            .singleElement()
+            .satisfies(ce -> assertThat(ce.getValue()).isEqualTo("test-ext-value"));
+    }
+}

src/test/java/de/mlessmann/certassist/repositories/CertificateSubjectPresetRepositoryTest.java

@@ -0,0 +1,26 @@
+package de.mlessmann.certassist.repositories;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import de.mlessmann.certassist.models.CertificateSubjectPreset;
+import jakarta.transaction.Transactional;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class CertificateSubjectPresetRepositoryTest {
+
+    @Autowired
+    private CertificateSubjectPresetRepository repository;
+
+    @Test
+    @Transactional
+    void findCertificateSubjectPreset() {
+        final CertificateSubjectPreset certificateSubjectPreset = new CertificateSubjectPreset();
+        certificateSubjectPreset.setCountry("DE");
+        repository.save(certificateSubjectPreset);
+
+        assertThat(repository.findById(certificateSubjectPreset.getId()).orElseThrow().getCountry()).isEqualTo("DE");
+    }
+}

src/test/java/de/mlessmann/certassist/repositories/UserRepositoryTest.java

@@ -1,12 +1,13 @@
 package de.mlessmann.certassist.repositories;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import de.mlessmann.certassist.models.User;
+import jakarta.transaction.Transactional;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 @SpringBootTest
 class UserRepositoryTest {
 
@@ -14,11 +15,12 @@ class UserRepositoryTest {
     private UserRepository userRepository;
 
     @Test
+    @Transactional
     void findUserById() {
         final User user = new User();
         user.setUsername("test");
         userRepository.save(user);
 
-        assertThat(userRepository.findUserById(user.getId()).getUsername()).isEqualTo("test");
+        assertThat(userRepository.findById(user.getId()).orElseThrow().getUsername()).isEqualTo("test");
     }
 }