Merge branch 'develop' of https://github.com/pterodactyl/wings into develop

router/router_server_files.go

@@ -341,6 +341,16 @@ func postServerDecompressFiles(c *gin.Context) {
 
 	hasSpace, err := s.Filesystem.SpaceAvailableForDecompression(data.RootPath, data.File)
 	if err != nil {
+		// Handle an unknown format error.
+		if errors.Is(err, server.ErrUnknownArchiveFormat) {
+			s.Log().WithField("error", err).Warn("failed to decompress file due to unknown format")
+
+			c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{
+				"error": "unknown archive format",
+			})
+			return
+		}
+
 		TrackedServerError(err, s).AbortWithServerError(c)
 		return
 	}

router/websocket/websocket.go

@@ -38,9 +38,9 @@ type Handler struct {
 }
 
 var (
-	ErrJwtNotPresent = errors.New("jwt: no jwt present")
+	ErrJwtNotPresent    = errors.New("jwt: no jwt present")
 	ErrJwtNoConnectPerm = errors.New("jwt: missing connect permission")
-	ErrJwtUuidMismatch = errors.New("jwt: server uuid mismatch")
+	ErrJwtUuidMismatch  = errors.New("jwt: server uuid mismatch")
 )
 
 func IsJwtError(err error) bool {