From: Michael Rasmussen Date: Tue, 11 Nov 2025 13:51:16 +0000 (+0100) Subject: Completed X-Git-Url: http://git.datanom.net/vault.git/commitdiff_plain/05e27cac1e41b8ad8f7b705e7da2f3a1ff7e159a?ds=sidebyside Completed --- diff --git a/src/main/java/dk/cbs/soa/soasi/secret/vault/ProjectHandleException.java b/src/main/java/dk/cbs/soa/soasi/secret/vault/ProjectHandleException.java new file mode 100644 index 0000000..1ce51df --- /dev/null +++ b/src/main/java/dk/cbs/soa/soasi/secret/vault/ProjectHandleException.java @@ -0,0 +1,15 @@ +package dk.cbs.soa.soasi.secret.vault; + +public class ProjectHandleException extends RuntimeException { + + private static final long serialVersionUID = -7888921768802904362L; + + public ProjectHandleException(String message) { + super(message); + } + + public ProjectHandleException(String message, Throwable cause) { + super(message, cause); + } + +} diff --git a/src/main/java/dk/cbs/soa/soasi/secret/vault/ProjectNotFoundException.java b/src/main/java/dk/cbs/soa/soasi/secret/vault/ProjectNotFoundException.java new file mode 100644 index 0000000..5c7fef6 --- /dev/null +++ b/src/main/java/dk/cbs/soa/soasi/secret/vault/ProjectNotFoundException.java @@ -0,0 +1,15 @@ +package dk.cbs.soa.soasi.secret.vault; + +public class ProjectNotFoundException extends RuntimeException { + + private static final long serialVersionUID = -1899398910147898420L; + + public ProjectNotFoundException(String message) { + super(message); + } + + public ProjectNotFoundException(String message, Throwable cause) { + super(message, cause); + } + +} diff --git a/src/main/java/dk/cbs/soa/soasi/secret/vault/controller/ErrorCode.java b/src/main/java/dk/cbs/soa/soasi/secret/vault/controller/ErrorCode.java new file mode 100644 index 0000000..7db9ee9 --- /dev/null +++ b/src/main/java/dk/cbs/soa/soasi/secret/vault/controller/ErrorCode.java @@ -0,0 +1,18 @@ +package dk.cbs.soa.soasi.secret.vault.controller; + +public enum ErrorCode { + ObjectNotFound, + NotNull, + InvalidArgument, + InvalidState, + TypeMismatch, + MissingId, + DataIntegrityViolationException, + InvalidFileFormat, + InvalidError, + ObjectCannotBeSaved, + InsufficientPermissions, + SystemError, + UniquenessViolationError, + InvalidDateRange +} diff --git a/src/main/java/dk/cbs/soa/soasi/secret/vault/controller/ErrorData.java b/src/main/java/dk/cbs/soa/soasi/secret/vault/controller/ErrorData.java new file mode 100644 index 0000000..58967af --- /dev/null +++ b/src/main/java/dk/cbs/soa/soasi/secret/vault/controller/ErrorData.java @@ -0,0 +1,16 @@ +package dk.cbs.soa.soasi.secret.vault.controller; + +import lombok.Builder; +import lombok.NonNull; +import lombok.Value; + +@Builder +@Value +public class ErrorData { + @NonNull + private ErrorCode errorCode; + private String message; + private String objectName; + private String propertyName; + +} diff --git a/src/main/java/dk/cbs/soa/soasi/secret/vault/controller/ErrorPayload.java b/src/main/java/dk/cbs/soa/soasi/secret/vault/controller/ErrorPayload.java new file mode 100644 index 0000000..bec15fc --- /dev/null +++ b/src/main/java/dk/cbs/soa/soasi/secret/vault/controller/ErrorPayload.java @@ -0,0 +1,27 @@ +package dk.cbs.soa.soasi.secret.vault.controller; + +import lombok.AllArgsConstructor; +import lombok.Value; + +import java.time.OffsetDateTime; +import java.util.List; + +import static lombok.AccessLevel.PRIVATE; + +@Value +@AllArgsConstructor(access = PRIVATE) +public class ErrorPayload { + private Integer count; + private String type; + private String traceId; + private OffsetDateTime timestamp; + private String status; + private List data; + + public static ErrorPayload createErrorPayload(List data, String traceId){ + if(data==null || data.isEmpty()){ + throw new IllegalArgumentException("At least one error object must be provided!"); + } + return new ErrorPayload(data.size(),ErrorData.class.getSimpleName(), traceId, OffsetDateTime.now(), "error", data); + } +} diff --git a/src/main/java/dk/cbs/soa/soasi/secret/vault/controller/GlobalExceptionHandler.java b/src/main/java/dk/cbs/soa/soasi/secret/vault/controller/GlobalExceptionHandler.java new file mode 100644 index 0000000..8e740cc --- /dev/null +++ b/src/main/java/dk/cbs/soa/soasi/secret/vault/controller/GlobalExceptionHandler.java @@ -0,0 +1,61 @@ +package dk.cbs.soa.soasi.secret.vault.controller; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.List; +import java.util.random.RandomGenerator; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; + +import dk.cbs.soa.soasi.secret.vault.ProjectNotFoundException; +import dk.cbs.soa.soasi.secret.vault.ProjectHandleException; + +import lombok.extern.slf4j.Slf4j; + +@ControllerAdvice +@Slf4j +public class GlobalExceptionHandler { + + @ExceptionHandler(ProjectNotFoundException.class) + @ResponseStatus(HttpStatus.NOT_FOUND) + public ResponseEntity handleProjectNotFoundException(Exception e) { + log.error(" handleException", e); + String currentTraceId = getTraceId(); + + List errorDataList = List.of(ErrorData.builder().errorCode(ErrorCode.ObjectNotFound).message(e.getMessage()).build()); + + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(ErrorPayload.createErrorPayload(errorDataList, currentTraceId)); + } + + @ExceptionHandler(ProjectHandleException.class) + @ResponseStatus(HttpStatus.BAD_REQUEST) + public ResponseEntity handleProjectHandleException(Exception e) { + log.error(" handleException", e); + String currentTraceId = getTraceId(); + + List errorDataList = List.of(ErrorData.builder().errorCode(ErrorCode.InvalidState).message(e.getMessage()).build()); + + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ErrorPayload.createErrorPayload(errorDataList, currentTraceId)); + } + + @ExceptionHandler(Exception.class) + @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) + public ResponseEntity handleException(Exception e) { + log.error(" handleException", e); + String currentTraceId = getTraceId(); + + List errorDataList = List.of(ErrorData.builder().errorCode(ErrorCode.SystemError).message(e.getMessage()).build()); + + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(ErrorPayload.createErrorPayload(errorDataList, currentTraceId)); + } + + private String getTraceId() { + RandomGenerator randomId = RandomGenerator.getDefault(); + + return String.valueOf(randomId.nextLong()); + } +} diff --git a/src/main/java/dk/cbs/soa/soasi/secret/vault/controller/ProjectController.java b/src/main/java/dk/cbs/soa/soasi/secret/vault/controller/ProjectController.java index ac4fa90..3fd900e 100644 --- a/src/main/java/dk/cbs/soa/soasi/secret/vault/controller/ProjectController.java +++ b/src/main/java/dk/cbs/soa/soasi/secret/vault/controller/ProjectController.java @@ -59,7 +59,7 @@ public class ProjectController { } Optional p = projectRepository.get(project.getToken()); if (p.isEmpty()) { - throw new IllegalArgumentException("Invalid token" + project.getToken()); + throw new IllegalArgumentException("Invalid token: " + project.getToken()); } model.addAttribute("project", p.get()); diff --git a/src/main/java/dk/cbs/soa/soasi/secret/vault/repository/ProjectRepository.java b/src/main/java/dk/cbs/soa/soasi/secret/vault/repository/ProjectRepository.java index 64d41bb..7617a96 100644 --- a/src/main/java/dk/cbs/soa/soasi/secret/vault/repository/ProjectRepository.java +++ b/src/main/java/dk/cbs/soa/soasi/secret/vault/repository/ProjectRepository.java @@ -12,6 +12,8 @@ import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.stereotype.Repository; +import dk.cbs.soa.soasi.secret.vault.ProjectHandleException; +import dk.cbs.soa.soasi.secret.vault.ProjectNotFoundException; import dk.cbs.soa.soasi.secret.vault.model.Project; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; @@ -33,24 +35,30 @@ public class ProjectRepository { MapSqlParameterSource namedParameters = new MapSqlParameterSource(); namedParameters.addValue("token", token); + Project p = null; - Project p = jdbcNamedTemplate.queryForObject(sqlGet, namedParameters, new RowMapper() { + try { + p = jdbcNamedTemplate.queryForObject(sqlGet, namedParameters, new RowMapper() { + + @Override + public Project mapRow(ResultSet rs, int rowNum) throws SQLException { + return Project.builder() + .id(rs.getString("id")) + .secret(rs.getString("secret")) + .token(rs.getString("token")) + .build(); + } + + }); - @Override - public Project mapRow(ResultSet rs, int rowNum) throws SQLException { - return Project.builder() - .id(rs.getString("id")) - .secret(rs.getString("secret")) - .token(rs.getString("token")) - .build(); - } - - }); - - log.info("Add: " + p.toString()); + log.info("Add: " + p.toString()); - if (p != null) { - jdbcTemplate.update(sqlDelete, token); + if (p != null) { + jdbcTemplate.update(sqlDelete, token); + } + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new ProjectNotFoundException(e.getMessage(), e); } return Optional.ofNullable(p); @@ -69,7 +77,12 @@ public class ProjectRepository { namedParameters.addValue("token", project.getToken()); namedParameters.addValue("id", project.getId()); - jdbcNamedTemplate.update(sqlInsert, namedParameters); + try { + jdbcNamedTemplate.update(sqlInsert, namedParameters); + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new ProjectHandleException(e.getMessage(), e); + } return Optional.ofNullable(project); } @@ -85,7 +98,12 @@ public class ProjectRepository { namedParameters.addValue("token", project.getToken()); namedParameters.addValue("secret", project.getSecret()); - jdbcNamedTemplate.update(sqlUpdate, namedParameters); + try { + jdbcNamedTemplate.update(sqlUpdate, namedParameters); + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new ProjectHandleException(e.getMessage(), e); + } } private UUID getRandomUuid() { diff --git a/src/main/resources/static/goodbye.html b/src/main/resources/static/goodbye.html index b5efa60..d76235a 100644 --- a/src/main/resources/static/goodbye.html +++ b/src/main/resources/static/goodbye.html @@ -3,8 +3,11 @@ GoodBye + +

GoodBye

+
\ No newline at end of file diff --git a/src/main/resources/static/style.css b/src/main/resources/static/style.css new file mode 100644 index 0000000..ecfe3ca --- /dev/null +++ b/src/main/resources/static/style.css @@ -0,0 +1,44 @@ +body { + background-color: #4967aa; +} + +.parent{ + position: relative; +} + +.label-bg { + background-color: #b1ff96; +} + +th { + background-color: #b1ff96; +} + +td { + background-color: #b1ff96; +} + +.form, .info { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} + +.value { + width: 400px; +} + +input[type="submit"] { + display: block; + width: 93%; + margin: 0 auto 1.25rem auto; + font-size: 1.1rem; + background-color: #e01b24; + border-color: #e01b24; + color: #ffffff; + border-radius: 3px; + font-family: Tahoma; + font-size: .9rem; + border: none; +} \ No newline at end of file diff --git a/src/main/resources/templates/add-project.html b/src/main/resources/templates/add-project.html index 60b8313..7f44f97 100644 --- a/src/main/resources/templates/add-project.html +++ b/src/main/resources/templates/add-project.html @@ -1,7 +1,18 @@ + + + + +Add project + + + +
- +

-
\ No newline at end of file + +
+ \ No newline at end of file diff --git a/src/main/resources/templates/create-info.html b/src/main/resources/templates/create-info.html index 3185749..2dfbbd1 100644 --- a/src/main/resources/templates/create-info.html +++ b/src/main/resources/templates/create-info.html @@ -1,25 +1,32 @@ - -Project Info + + Project Info + - - - - - - - - - - - - -
IdTokenSecret
- - -
+ + + + + + + + + + + + + + + + + + + + + +
KeyValue
Id
Token
Secret
diff --git a/src/main/resources/templates/create-project.html b/src/main/resources/templates/create-project.html index d00b6b2..07d34f2 100644 --- a/src/main/resources/templates/create-project.html +++ b/src/main/resources/templates/create-project.html @@ -1,7 +1,18 @@ + + + + +Create project + + + +
- +

-
\ No newline at end of file + +
+ \ No newline at end of file diff --git a/src/main/resources/templates/get-secret.html b/src/main/resources/templates/get-secret.html index c0c2fc0..89643cf 100644 --- a/src/main/resources/templates/get-secret.html +++ b/src/main/resources/templates/get-secret.html @@ -1,11 +1,22 @@ + + + + +Send secret + + + +
- +
- +

- -
\ No newline at end of file + + +
+ \ No newline at end of file diff --git a/src/main/resources/templates/project-info.html b/src/main/resources/templates/project-info.html index 85d0850..2eb1022 100644 --- a/src/main/resources/templates/project-info.html +++ b/src/main/resources/templates/project-info.html @@ -1,23 +1,28 @@ - -Project Info + + Project Info + - - - - - - - - - - - -
IdToken
- -
+ + + + + + + + + + + + + + + +
KeyValue
Id +
Token +