Better formatted responses for api errors

Use HangarApiException for any thrown api errors.

Closes #117

src/main/java/io/papermc/hangar/controller/OrgController.java

@@ -7,6 +7,7 @@ import io.papermc.hangar.db.customtypes.LoggedActionType.OrganizationContext;
 import io.papermc.hangar.db.model.OrganizationsTable;
 import io.papermc.hangar.db.model.UserOrganizationRolesTable;
 import io.papermc.hangar.db.model.UsersTable;
+import io.papermc.hangar.exceptions.HangarException;
 import io.papermc.hangar.model.NamedPermission;
 import io.papermc.hangar.model.NotificationType;
 import io.papermc.hangar.model.Role;
@@ -22,7 +23,6 @@ import io.papermc.hangar.service.UserActionLogService;
 import io.papermc.hangar.service.UserService;
 import io.papermc.hangar.util.AlertUtil;
 import io.papermc.hangar.util.AlertUtil.AlertType;
-import io.papermc.hangar.util.HangarException;
 import io.papermc.hangar.util.Routes;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;

src/main/java/io/papermc/hangar/controller/ProjectsController.java

@@ -15,6 +15,7 @@ import io.papermc.hangar.db.model.ProjectOwner;
 import io.papermc.hangar.db.model.ProjectsTable;
 import io.papermc.hangar.db.model.UserProjectRolesTable;
 import io.papermc.hangar.db.model.UsersTable;
+import io.papermc.hangar.exceptions.HangarException;
 import io.papermc.hangar.model.Category;
 import io.papermc.hangar.model.FlagReason;
 import io.papermc.hangar.model.NamedPermission;
@@ -44,7 +45,6 @@ import io.papermc.hangar.service.project.ProjectService;
 import io.papermc.hangar.util.AlertUtil;
 import io.papermc.hangar.util.AlertUtil.AlertType;
 import io.papermc.hangar.util.FileUtils;
-import io.papermc.hangar.util.HangarException;
 import io.papermc.hangar.util.Routes;
 import io.papermc.hangar.util.StringUtils;
 import io.papermc.hangar.util.TemplateHelper;

src/main/java/io/papermc/hangar/controller/UsersController.java

@@ -8,6 +8,7 @@ import io.papermc.hangar.db.model.NotificationsTable;
 import io.papermc.hangar.db.model.OrganizationsTable;
 import io.papermc.hangar.db.model.UserSessionsTable;
 import io.papermc.hangar.db.model.UsersTable;
+import io.papermc.hangar.exceptions.HangarException;
 import io.papermc.hangar.model.InviteFilter;
 import io.papermc.hangar.model.NamedPermission;
 import io.papermc.hangar.model.NotificationFilter;
@@ -31,7 +32,6 @@ import io.papermc.hangar.service.UserService;
 import io.papermc.hangar.service.sso.AuthUser;
 import io.papermc.hangar.service.sso.UrlWithNonce;
 import io.papermc.hangar.util.AlertUtil;
-import io.papermc.hangar.util.HangarException;
 import io.papermc.hangar.util.Routes;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;

src/main/java/io/papermc/hangar/controller/VersionsController.java

@@ -15,6 +15,7 @@ import io.papermc.hangar.db.model.ProjectVersionUnsafeDownloadsTable;
 import io.papermc.hangar.db.model.ProjectVersionsTable;
 import io.papermc.hangar.db.model.ProjectsTable;
 import io.papermc.hangar.db.model.UsersTable;
+import io.papermc.hangar.exceptions.HangarException;
 import io.papermc.hangar.model.Color;
 import io.papermc.hangar.model.DownloadType;
 import io.papermc.hangar.model.NamedPermission;
@@ -39,7 +40,6 @@ import io.papermc.hangar.service.project.ProjectService;
 import io.papermc.hangar.util.AlertUtil;
 import io.papermc.hangar.util.AlertUtil.AlertType;
 import io.papermc.hangar.util.FileUtils;
-import io.papermc.hangar.util.HangarException;
 import io.papermc.hangar.util.RequestUtil;
 import io.papermc.hangar.util.Routes;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/io/papermc/hangar/controller/api/ApiController.java

@@ -0,0 +1,11 @@
+package io.papermc.hangar.controller.api;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ApiController {
+}

src/main/java/io/papermc/hangar/controller/api/AuthenticateApiController.java

@@ -1,8 +1,8 @@
 package io.papermc.hangar.controller.api;
 
-import io.papermc.hangar.security.HangarAuthentication;
 import io.papermc.hangar.model.generated.ApiSessionResponse;
 import io.papermc.hangar.model.generated.SessionProperties;
+import io.papermc.hangar.security.HangarAuthentication;
 import io.papermc.hangar.service.AuthenticationService;
 import io.papermc.hangar.util.AuthUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +11,7 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 
+@ApiController
 @Controller
 public class AuthenticateApiController implements AuthenticateApi {
 

src/main/java/io/papermc/hangar/controller/api/HangarApiResponseEntityExceptionHandler.java

@@ -0,0 +1,36 @@
+package io.papermc.hangar.controller.api;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.papermc.hangar.exceptions.HangarApiException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.servlet.View;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
+
+import javax.servlet.http.HttpServletRequest;
+
+@ControllerAdvice(annotations = {ApiController.class})
+public class HangarApiResponseEntityExceptionHandler extends ResponseEntityExceptionHandler {
+
+    private final ObjectMapper mapper;
+
+    @Autowired
+    public HangarApiResponseEntityExceptionHandler(ObjectMapper mapper) {
+        this.mapper = mapper;
+    }
+
+    @ExceptionHandler(HangarApiException.class)
+    public ResponseEntity<ObjectNode> handleException(HangarApiException exception, HttpServletRequest request) {
+        ObjectNode response = mapper.createObjectNode()
+                .put("message", exception.getReason());
+        ObjectNode error = mapper.createObjectNode()
+                .put("message", exception.getStatus().getReasonPhrase())
+                .put("code", exception.getStatus().value());
+        response.set("error", error);
+        response.set("path_params", mapper.valueToTree(request.getAttribute(View.PATH_VARIABLES)));
+        return new ResponseEntity<>(response, exception.getResponseHeaders(), exception.getStatus());
+    }
+}

src/main/java/io/papermc/hangar/controller/api/KeysApiController.java

@@ -2,6 +2,7 @@ package io.papermc.hangar.controller.api;
 
 import io.papermc.hangar.db.customtypes.LoggedActionType;
 import io.papermc.hangar.db.customtypes.LoggedActionType.UserContext;
+import io.papermc.hangar.exceptions.HangarApiException;
 import io.papermc.hangar.model.ApiAuthInfo;
 import io.papermc.hangar.model.NamedPermission;
 import io.papermc.hangar.model.Permission;
@@ -14,13 +15,13 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.server.ResponseStatusException;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+@ApiController
 @Controller
 public class KeysApiController implements KeysApi {
 
@@ -45,25 +46,25 @@ public class KeysApiController implements KeysApi {
         try {
             perms = NamedPermission.parseNamed(body.getPermissions());
         } catch (IllegalArgumentException e) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Invalid permission name");
+            throw new HangarApiException(HttpStatus.BAD_REQUEST, "Invalid permission name");
         }
         if (perms.isEmpty()) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Must include one permission");
+            throw new HangarApiException(HttpStatus.BAD_REQUEST, "Must include one permission");
         }
         if (body.getName().length() > 255) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Name too long");
+            throw new HangarApiException(HttpStatus.BAD_REQUEST, "Name too long");
         }
         Permission perm = perms.stream().map(NamedPermission::getPermission).reduce(Permission::add).orElse(Permission.None);
         boolean isSubKey = apiAuthInfo.getKey() == null || apiAuthInfo.getKey().isSubKey(perm);
         if (!isSubKey) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Not enough permissions to create that key");
+            throw new HangarApiException(HttpStatus.BAD_REQUEST, "Not enough permissions to create that key");
         }
         String tokenIdentifier = UUID.randomUUID().toString();
         String token = UUID.randomUUID().toString();
         long userId = apiAuthInfo.getUser().getId();
 
         if (apiKeyService.getKey(body.getName(), userId) != null) {
-            throw new ResponseStatusException(HttpStatus.CONFLICT, "Name already taken");
+            throw new HangarApiException(HttpStatus.CONFLICT, "Name already taken");
         }
 
         apiKeyService.createApiKey(body.getName(), userId, tokenIdentifier, token, perm);
@@ -75,11 +76,11 @@ public class KeysApiController implements KeysApi {
     @PreAuthorize("@authenticationService.authApiRequest(T(io.papermc.hangar.model.Permission).EditApiKeys, T(io.papermc.hangar.controller.util.ApiScope).forGlobal())")
     public ResponseEntity<Void> deleteKey(String name) {
         if (apiAuthInfo.getUser() == null) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Public keys can't be used to delete");
+            throw new HangarApiException(HttpStatus.BAD_REQUEST, "Public keys can't be used to delete");
         }
         int rowsAffected = apiKeyService.deleteApiKey(name, apiAuthInfo.getUser().getId());
         if (rowsAffected == 0) {
-            throw new ResponseStatusException(HttpStatus.NOT_FOUND);
+            throw new HangarApiException(HttpStatus.NOT_FOUND);
         } else {
             userActionLogService.user(request, LoggedActionType.USER_APIKEY_DELETE.with(UserContext.of(apiAuthInfo.getUserId())), "", "Key Name: " + name);
             return new ResponseEntity<>(HttpStatus.NO_CONTENT);

src/main/java/io/papermc/hangar/controller/api/PermissionsApiController.java

@@ -1,7 +1,7 @@
 package io.papermc.hangar.controller.api;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-
+import io.papermc.hangar.exceptions.HangarApiException;
 import io.papermc.hangar.model.ApiAuthInfo;
 import io.papermc.hangar.model.NamedPermission;
 import io.papermc.hangar.model.Permission;
@@ -16,12 +16,12 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.server.ResponseStatusException;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.function.BiPredicate;
 
+@ApiController
 @Controller
 public class PermissionsApiController implements PermissionsApi {
 
@@ -65,7 +65,7 @@ public class PermissionsApiController implements PermissionsApi {
             Permission perms = permissionService.getOrganizationPermissions(apiAuthInfo.getUser(), organizationName);
             return new ImmutablePair<>(PermissionType.ORGANIZATION, perms);
         } else {
-            throw new ResponseStatusException(HttpStatus.NOT_FOUND);
+            throw new HangarApiException(HttpStatus.BAD_REQUEST, "You must specify either a pluginId or an organizationName");
         }
     }
 

src/main/java/io/papermc/hangar/controller/api/ProjectsApiController.java

@@ -1,6 +1,7 @@
 package io.papermc.hangar.controller.api;
 
 import io.papermc.hangar.config.hangar.HangarConfig;
+import io.papermc.hangar.exceptions.HangarApiException;
 import io.papermc.hangar.model.ApiAuthInfo;
 import io.papermc.hangar.model.Category;
 import io.papermc.hangar.model.Permission;
@@ -20,7 +21,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.server.ResponseStatusException;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
@@ -29,6 +29,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+@ApiController
 @Controller
 public class ProjectsApiController implements ProjectsApi {
 
@@ -104,7 +105,7 @@ public class ProjectsApiController implements ProjectsApi {
         List<ProjectMember> projectMembers = projectApiService.getProjectMembers(pluginId, limit, offset);
         if (projectMembers == null || projectMembers.isEmpty()) { // TODO this will also happen when the offset is too high
             log.error("Couldn't find a project for that pluginId");
-            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+            throw new HangarApiException(HttpStatus.NOT_FOUND, "Couldn't find a project for pluginId: " + pluginId);
         }
         return ResponseEntity.ok(projectMembers);
     }
@@ -117,7 +118,7 @@ public class ProjectsApiController implements ProjectsApi {
         Project project = projectApiService.getProject(pluginId, seeHidden, apiAuthInfo.getUserId());
         if (project == null) {
             log.error("Couldn't find a project for that pluginId");
-            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+            throw new HangarApiException(HttpStatus.NOT_FOUND, "Couldn't find a project for pluginId: " + pluginId);
         }
         return ResponseEntity.ok(project);
     }
@@ -129,12 +130,12 @@ public class ProjectsApiController implements ProjectsApi {
         LocalDate from = ApiUtil.parseDate(fromDate);
         LocalDate to = ApiUtil.parseDate(toDate);
         if (from.isAfter(to)) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "From date is after to date");
+            throw new HangarApiException(HttpStatus.BAD_REQUEST, "From date is after to date");
         }
         Map<String, ProjectStatsDay> projectStats = projectApiService.getProjectStats(pluginId, from, to);
         if (projectStats == null || projectStats.size() == 0) {
             log.error("Couldn't find a project for that pluginId");
-            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+            throw new HangarApiException(HttpStatus.NOT_FOUND, "Couldn't find a project for pluginId: " + pluginId);
         }
         return ResponseEntity.ok(projectStats);
     }

src/main/java/io/papermc/hangar/controller/api/SessionsApiController.java

@@ -1,7 +1,8 @@
 package io.papermc.hangar.controller.api;
 
-import io.papermc.hangar.db.dao.api.SessionsDao;
 import io.papermc.hangar.db.dao.HangarDao;
+import io.papermc.hangar.db.dao.api.SessionsDao;
+import io.papermc.hangar.exceptions.HangarApiException;
 import io.papermc.hangar.util.AuthUtils;
 import io.papermc.hangar.util.AuthUtils.AuthCredentials;
 import org.slf4j.Logger;
@@ -11,8 +12,8 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.server.ResponseStatusException;
 
+@ApiController
 @Controller
 public class SessionsApiController implements SessionsApi {
 
@@ -30,7 +31,7 @@ public class SessionsApiController implements SessionsApi {
     public ResponseEntity<Void> deleteSession() {
         AuthCredentials credentials = AuthUtils.parseAuthHeader(true);
         if (credentials.getSession() == null) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "This request was not made with a session");
+            throw new HangarApiException(HttpStatus.BAD_REQUEST, "This request was not made with a session");
         }
         sessionsDao.get().delete(credentials.getSession());
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);

src/main/java/io/papermc/hangar/controller/api/SsoApiController.java

@@ -1,13 +1,14 @@
 package io.papermc.hangar.controller.api;
 
+import io.papermc.hangar.config.hangar.SsoConfig;
+import io.papermc.hangar.exceptions.HangarApiException;
 import io.papermc.hangar.model.SsoSyncData;
 import io.papermc.hangar.service.SsoService;
 import io.papermc.hangar.service.UserService;
-import io.papermc.hangar.config.hangar.SsoConfig;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import javax.validation.constraints.NotEmpty;
 import java.util.Map;
 
+@ApiController
 @Controller
 public class SsoApiController implements SsoApi {
 
@@ -35,7 +37,7 @@ public class SsoApiController implements SsoApi {
     public ResponseEntity<Void> syncSso(@NotEmpty String sso, @NotEmpty String sig, @RequestParam(name = "api_key") @NotEmpty String apiKey) {
         if (!apiKey.equals(ssoConfig.getApiKey())) {
             log.warn("SSO sync failed: bad API key (" + apiKey + " provided, " + ssoConfig.getApiKey() + " expected)");
-            return ResponseEntity.badRequest().build();
+            throw new HangarApiException(HttpStatus.BAD_REQUEST, "SSO sync failed: bad API key (" + apiKey + " provided, " + ssoConfig.getApiKey() + " expected)");
         }
 
         try {
@@ -46,7 +48,7 @@ public class SsoApiController implements SsoApi {
             return ResponseEntity.ok().build();
         } catch (SsoService.SignatureException e) {
             log.warn("SSO sync failed: invalid signature (" + sig + " for data " + sso + ")");
-            return ResponseEntity.badRequest().build();
+            throw new HangarApiException(HttpStatus.BAD_REQUEST, "SSO sync failed: invalid signature (" + sig + " for data " + sso + ")");
         }
     }
 }

src/main/java/io/papermc/hangar/controller/api/UsersApiController.java

@@ -1,6 +1,7 @@
 package io.papermc.hangar.controller.api;
 
 import io.papermc.hangar.config.hangar.HangarConfig;
+import io.papermc.hangar.exceptions.HangarApiException;
 import io.papermc.hangar.model.ApiAuthInfo;
 import io.papermc.hangar.model.Permission;
 import io.papermc.hangar.model.generated.PaginatedCompactProjectResult;
@@ -17,10 +18,10 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.server.ResponseStatusException;
 
 import java.util.List;
 
+@ApiController
 @Controller
 public class UsersApiController implements UsersApi {
 
@@ -57,7 +58,7 @@ public class UsersApiController implements UsersApi {
         User userObj = userApiService.getUser(user);
         if (userObj == null) {
             log.error("Couldn't find a user with " + user + " name!");
-            throw new ResponseStatusException(HttpStatus.NOT_FOUND);
+            throw new HangarApiException(HttpStatus.NOT_FOUND, "Couldn't find a user with " + user + " name!");
         }
         return ResponseEntity.ok(userObj);
     }

src/main/java/io/papermc/hangar/controller/api/VersionsApiController.java

@@ -1,18 +1,17 @@
 package io.papermc.hangar.controller.api;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import io.papermc.hangar.config.hangar.HangarConfig;
+import io.papermc.hangar.exceptions.HangarApiException;
 import io.papermc.hangar.model.ApiAuthInfo;
-import io.papermc.hangar.service.api.VersionApiService;
-import io.papermc.hangar.util.ApiUtil;
 import io.papermc.hangar.model.Permission;
 import io.papermc.hangar.model.generated.DeployVersionInfo;
 import io.papermc.hangar.model.generated.PaginatedVersionResult;
 import io.papermc.hangar.model.generated.Pagination;
 import io.papermc.hangar.model.generated.Version;
 import io.papermc.hangar.model.generated.VersionStatsDay;
-
+import io.papermc.hangar.service.api.VersionApiService;
+import io.papermc.hangar.util.ApiUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,16 +20,15 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.server.ResponseStatusException;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.io.IOException;
 import java.time.LocalDate;
-import java.time.format.DateTimeParseException;
 import java.util.List;
 import java.util.Map;
 
+@ApiController
 @Controller
 public class VersionsApiController implements VersionsApi {
 
@@ -75,9 +73,9 @@ public class VersionsApiController implements VersionsApi {
     public ResponseEntity<Version> showVersion(String pluginId, String name) {
         Version version = versionApiService.getVersion(pluginId, name, apiAuthInfo.getGlobalPerms().has(Permission.SeeHidden), ApiUtil.userIdOrNull(apiAuthInfo.getUser()));
         if (version == null) {
-            throw new ResponseStatusException(HttpStatus.NOT_FOUND);
+            throw new HangarApiException(HttpStatus.NOT_FOUND);
         } else {
-            return new ResponseEntity<>(version, HttpStatus.OK);
+            return ResponseEntity.ok(version);
         }
     }
 
@@ -88,11 +86,11 @@ public class VersionsApiController implements VersionsApi {
         LocalDate from = ApiUtil.parseDate(fromDate);
         LocalDate to = ApiUtil.parseDate(toDate);
         if (from.isAfter(to)) {
-            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "From date is after to date");
+            throw new HangarApiException(HttpStatus.BAD_REQUEST, "From date is after to date");
         }
         Map<String, VersionStatsDay> versionStats = versionApiService.getVersionStats(pluginId, version, from, to);
         if (versionStats.isEmpty()) {
-            throw new ResponseStatusException(HttpStatus.NOT_FOUND); // TODO Not found might not be right here?
+            throw new HangarApiException(HttpStatus.NOT_FOUND); // TODO Not found might not be right here?
         }
         return ResponseEntity.ok(versionStats);
     }

src/main/java/io/papermc/hangar/exceptions/HangarApiException.java

@@ -0,0 +1,37 @@
+package io.papermc.hangar.exceptions;
+
+import org.jetbrains.annotations.NotNull;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.server.ResponseStatusException;
+
+public class HangarApiException extends ResponseStatusException {
+
+    private final HttpHeaders httpHeaders;
+
+    public HangarApiException(HttpStatus status) {
+        super(status);
+        this.httpHeaders = HttpHeaders.EMPTY;
+    }
+
+    public HangarApiException(HttpStatus status, String reason) {
+        super(status, reason);
+        this.httpHeaders = HttpHeaders.EMPTY;
+    }
+
+    public HangarApiException(HttpStatus status, HttpHeaders httpHeaders) {
+        super(status);
+        this.httpHeaders = httpHeaders;
+    }
+
+    public HangarApiException(HttpStatus status, String reason, HttpHeaders httpHeaders) {
+        super(status, reason);
+        this.httpHeaders = httpHeaders;
+    }
+
+    @NotNull
+    @Override
+    public HttpHeaders getResponseHeaders() {
+        return httpHeaders;
+    }
+}

src/main/java/io/papermc/hangar/exceptions/HangarException.java

@@ -1,4 +1,4 @@
-package io.papermc.hangar.util;
+package io.papermc.hangar.exceptions;
 
 public class HangarException extends RuntimeException {
 

src/main/java/io/papermc/hangar/exceptions/HeaderResponseStatusException.java

@@ -1,4 +1,4 @@
-package io.papermc.hangar.util;
+package io.papermc.hangar.exceptions;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

src/main/java/io/papermc/hangar/security/UserLockException.java

@@ -1,6 +1,6 @@
 package io.papermc.hangar.security;
 
-import io.papermc.hangar.util.HangarException;
+import io.papermc.hangar.exceptions.HangarException;
 import io.papermc.hangar.util.Routes;
 import org.springframework.web.servlet.ModelAndView;
 

src/main/java/io/papermc/hangar/service/AuthenticationService.java

@@ -13,6 +13,7 @@ import io.papermc.hangar.db.dao.api.SessionsDao;
 import io.papermc.hangar.db.model.ApiKeysTable;
 import io.papermc.hangar.db.model.ApiSessionsTable;
 import io.papermc.hangar.db.model.UsersTable;
+import io.papermc.hangar.exceptions.HangarApiException;
 import io.papermc.hangar.model.ApiAuthInfo;
 import io.papermc.hangar.model.Permission;
 import io.papermc.hangar.model.Role;
@@ -156,7 +157,7 @@ public class AuthenticationService extends HangarService {
 
             return new ApiSessionResponse(apiSession.getToken(), apiSession.getExpires(), SessionType.DEV);
         } else {
-            throw new ResponseStatusException(HttpStatus.FORBIDDEN);
+            throw new HangarApiException(HttpStatus.FORBIDDEN);
         }
     }
 
@@ -173,7 +174,7 @@ public class AuthenticationService extends HangarService {
                 throw AuthUtils.unAuth("No valid apikey parameter found in Authorization");
             }
             if (sessionExpiration == null) {
-                throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "The requested expiration can't be used");
+                throw new HangarApiException(HttpStatus.BAD_REQUEST, "The requested expiration can't be used");
             }
             // I THINK that is how its setup, couldn't really figure it out via ore
             String identifier = credentials.getApiKey().split("\\.")[0];
@@ -186,7 +187,7 @@ public class AuthenticationService extends HangarService {
             sessionType = SessionType.KEY;
         } else {
             if (publicSessionExpiration == null) {
-                throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "The requested expiration can't be used");
+                throw new HangarApiException(HttpStatus.BAD_REQUEST, "The requested expiration can't be used");
             }
             apiSession = new ApiSessionsTable(uuidToken, null, null, publicSessionExpiration);
             sessionType = SessionType.PUBLIC;

src/main/java/io/papermc/hangar/service/OrgFactory.java

@@ -10,11 +10,11 @@ import io.papermc.hangar.db.dao.OrganizationDao;
 import io.papermc.hangar.db.dao.UserDao;
 import io.papermc.hangar.db.model.OrganizationsTable;
 import io.papermc.hangar.db.model.UsersTable;
+import io.papermc.hangar.exceptions.HangarException;
 import io.papermc.hangar.model.NotificationType;
 import io.papermc.hangar.model.Role;
 import io.papermc.hangar.model.viewhelpers.UserData;
 import io.papermc.hangar.service.sso.AuthUser;
-import io.papermc.hangar.util.HangarException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;

src/main/java/io/papermc/hangar/service/SsoService.java

@@ -6,10 +6,10 @@ import io.papermc.hangar.config.hangar.HangarConfig;
 import io.papermc.hangar.db.dao.HangarDao;
 import io.papermc.hangar.db.dao.UserSignOnDao;
 import io.papermc.hangar.db.model.UserSignOnsTable;
+import io.papermc.hangar.exceptions.HangarException;
 import io.papermc.hangar.service.sso.AuthUser;
 import io.papermc.hangar.service.sso.UrlWithNonce;
 import io.papermc.hangar.util.CryptoUtils;
-import io.papermc.hangar.util.HangarException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/io/papermc/hangar/service/VersionService.java

@@ -10,6 +10,7 @@ import io.papermc.hangar.db.model.ProjectVersionVisibilityChangesTable;
 import io.papermc.hangar.db.model.ProjectVersionsTable;
 import io.papermc.hangar.db.model.ProjectsTable;
 import io.papermc.hangar.db.model.UsersTable;
+import io.papermc.hangar.exceptions.HangarException;
 import io.papermc.hangar.model.Permission;
 import io.papermc.hangar.model.TagColor;
 import io.papermc.hangar.model.Visibility;
@@ -22,7 +23,6 @@ import io.papermc.hangar.model.viewhelpers.VersionData;
 import io.papermc.hangar.service.pluginupload.PendingVersion;
 import io.papermc.hangar.service.project.ChannelService;
 import io.papermc.hangar.service.project.ProjectService;
-import io.papermc.hangar.util.HangarException;
 import io.papermc.hangar.util.RequestUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;

src/main/java/io/papermc/hangar/service/plugindata/PluginDataService.java

@@ -1,5 +1,7 @@
 package io.papermc.hangar.service.plugindata;
 
+import io.papermc.hangar.exceptions.HangarException;
+import io.papermc.hangar.service.plugindata.handler.FileTypeHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,10 +21,7 @@ import java.util.jar.JarInputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import io.papermc.hangar.util.HangarException;
-import io.papermc.hangar.service.plugindata.handler.FileTypeHandler;
-
-import static io.papermc.hangar.service.plugindata.DataValue.*;
+import static io.papermc.hangar.service.plugindata.DataValue.UUIDDataValue;
 
 @Service
 public class PluginDataService {

src/main/java/io/papermc/hangar/service/pluginupload/PluginUploadService.java

@@ -5,11 +5,13 @@ import io.papermc.hangar.config.hangar.HangarConfig;
 import io.papermc.hangar.db.model.ProjectChannelsTable;
 import io.papermc.hangar.db.model.ProjectsTable;
 import io.papermc.hangar.db.model.UsersTable;
+import io.papermc.hangar.exceptions.HangarException;
+import io.papermc.hangar.service.VersionService;
+import io.papermc.hangar.service.plugindata.PluginDataService;
+import io.papermc.hangar.service.plugindata.PluginFileData;
 import io.papermc.hangar.service.plugindata.PluginFileWithData;
 import io.papermc.hangar.service.project.ChannelService;
 import io.papermc.hangar.util.StringUtils;
-import io.papermc.hangar.service.VersionService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,10 +23,6 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import io.papermc.hangar.service.plugindata.PluginDataService;
-import io.papermc.hangar.service.plugindata.PluginFileData;
-import io.papermc.hangar.util.HangarException;
-
 @Service
 public class PluginUploadService {
 

src/main/java/io/papermc/hangar/service/project/ChannelFactory.java

@@ -4,9 +4,8 @@ import io.papermc.hangar.config.hangar.HangarConfig;
 import io.papermc.hangar.db.dao.HangarDao;
 import io.papermc.hangar.db.dao.ProjectChannelDao;
 import io.papermc.hangar.db.model.ProjectChannelsTable;
+import io.papermc.hangar.exceptions.HangarException;
 import io.papermc.hangar.model.Color;
-import io.papermc.hangar.util.HangarException;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/io/papermc/hangar/service/project/ChannelService.java

@@ -5,8 +5,8 @@ import io.papermc.hangar.db.dao.HangarDao;
 import io.papermc.hangar.db.dao.ProjectChannelDao;
 import io.papermc.hangar.db.model.ProjectChannelsTable;
 import io.papermc.hangar.db.model.ProjectsTable;
+import io.papermc.hangar.exceptions.HangarException;
 import io.papermc.hangar.model.Color;
-import io.papermc.hangar.util.HangarException;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/io/papermc/hangar/service/project/PagesFactory.java

@@ -2,12 +2,11 @@ package io.papermc.hangar.service.project;
 
 import io.papermc.hangar.config.hangar.HangarConfig;
 import io.papermc.hangar.db.dao.HangarDao;
-import io.papermc.hangar.db.model.ProjectPagesTable;
-import io.papermc.hangar.util.StringUtils;
 import io.papermc.hangar.db.dao.ProjectPageDao;
+import io.papermc.hangar.db.model.ProjectPagesTable;
+import io.papermc.hangar.exceptions.HangarException;
 import io.papermc.hangar.model.viewhelpers.ProjectPage;
-import io.papermc.hangar.util.HangarException;
-
+import io.papermc.hangar.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.lang.Nullable;

src/main/java/io/papermc/hangar/service/project/ProjectFactory.java

@@ -15,6 +15,7 @@ import io.papermc.hangar.db.model.ProjectPagesTable;
 import io.papermc.hangar.db.model.ProjectVersionsTable;
 import io.papermc.hangar.db.model.ProjectsTable;
 import io.papermc.hangar.db.model.UsersTable;
+import io.papermc.hangar.exceptions.HangarException;
 import io.papermc.hangar.model.Category;
 import io.papermc.hangar.model.NotificationType;
 import io.papermc.hangar.model.Platform;
@@ -32,7 +33,6 @@ import io.papermc.hangar.service.VersionService;
 import io.papermc.hangar.service.plugindata.PluginFileWithData;
 import io.papermc.hangar.service.pluginupload.PendingVersion;
 import io.papermc.hangar.service.pluginupload.ProjectFiles;
-import io.papermc.hangar.util.HangarException;
 import io.papermc.hangar.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.lang.Nullable;

src/main/java/io/papermc/hangar/util/AuthUtils.java

@@ -1,11 +1,11 @@
 package io.papermc.hangar.util;
 
+import io.papermc.hangar.exceptions.HangarApiException;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import org.springframework.web.server.ResponseStatusException;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.Duration;
@@ -23,13 +23,13 @@ public class AuthUtils {
     public static RuntimeException unAuth() {
         HttpHeaders headers = new HttpHeaders();
         headers.add(HttpHeaders.WWW_AUTHENTICATE, "HangarApi");
-        return new HeaderResponseStatusException(HttpStatus.UNAUTHORIZED, headers);
+        return new HangarApiException(HttpStatus.UNAUTHORIZED, headers);
     }
 
     public static RuntimeException unAuth(String message) {
         HttpHeaders headers = new HttpHeaders();
         headers.add(HttpHeaders.WWW_AUTHENTICATE, "HangarApi");
-        return new HeaderResponseStatusException(HttpStatus.UNAUTHORIZED, message, headers);
+        return new HangarApiException(HttpStatus.UNAUTHORIZED, message, headers);
     }
 
     public static OffsetDateTime expiration(Duration expirationDuration, Long userChoice) {
@@ -52,7 +52,7 @@ public class AuthUtils {
         String authHeader = request == null ? ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest().getHeader(HttpHeaders.AUTHORIZATION) : request.getHeader(HttpHeaders.AUTHORIZATION);
         boolean missingAuthHeader = authHeader == null || authHeader.isBlank() || !authHeader.startsWith("HangarApi");
         if (missingAuthHeader && requireHeader) {
-            throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
+            throw new HangarApiException(HttpStatus.UNAUTHORIZED);
         } else if (missingAuthHeader) {
             return new AuthCredentials(null, null);
         }
@@ -86,7 +86,7 @@ public class AuthUtils {
             } else if (sessionMatcher.find()) {
                 sessionKey = sessionMatcher.group();
             } else {
-                throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "Invalid Authorization header format");
+                throw new HangarApiException(HttpStatus.UNAUTHORIZED, "Invalid Authorization header format");
             }
             return new AuthCredentials(apiKey, sessionKey);
         }

src/test/java/io/papermc/hangar/service/plugindata/PluginDataServiceTest.java

@@ -1,5 +1,9 @@
 package io.papermc.hangar.service.plugindata;
 
+import io.papermc.hangar.exceptions.HangarException;
+import io.papermc.hangar.service.plugindata.handler.PaperPluginFileHandler;
+import io.papermc.hangar.service.plugindata.handler.VelocityFileHandler;
+import io.papermc.hangar.service.plugindata.handler.WaterfallPluginFileHandler;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,11 +13,6 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
 import java.nio.file.Path;
 import java.util.List;
 
-import io.papermc.hangar.service.plugindata.handler.VelocityFileHandler;
-import io.papermc.hangar.service.plugindata.handler.WaterfallPluginFileHandler;
-import io.papermc.hangar.util.HangarException;
-import io.papermc.hangar.service.plugindata.handler.PaperPluginFileHandler;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;