-
Notifications
You must be signed in to change notification settings - Fork 22
copy/merge in the FileManager and MultipartConfiguration changes from the maint. branch #36
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
src/main/java/io/fusionauth/http/ContentTooLargeException.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
/* | ||
* Copyright (c) 2025, FusionAuth, All Rights Reserved | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, | ||
* either express or implied. See the License for the specific | ||
* language governing permissions and limitations under the License. | ||
*/ | ||
package io.fusionauth.http; | ||
|
||
/** | ||
* Thrown when a request exceeds the total configured maximum size. | ||
* | ||
* @author Daniel DeGroff | ||
*/ | ||
public class ContentTooLargeException extends HTTPProcessingException { | ||
public long maximumRequestSize; | ||
|
||
public ContentTooLargeException(long maximumRequestSize, String detailedMessage) { | ||
super(413, "Content Too Large", detailedMessage); | ||
this.maximumRequestSize = maximumRequestSize; | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
src/main/java/io/fusionauth/http/HTTPProcessingException.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
/* | ||
* Copyright (c) 2025, FusionAuth, All Rights Reserved | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, | ||
* either express or implied. See the License for the specific | ||
* language governing permissions and limitations under the License. | ||
*/ | ||
package io.fusionauth.http; | ||
|
||
/** | ||
* A base HTTP processing exception that is able to suggest a status code to return the client. | ||
*/ | ||
public abstract class HTTPProcessingException extends RuntimeException { | ||
protected final int status; | ||
|
||
protected final String statusMessage; | ||
|
||
protected HTTPProcessingException(int status, String statusMessage) { | ||
this.status = status; | ||
this.statusMessage = statusMessage; | ||
} | ||
|
||
protected HTTPProcessingException(int status, String statusMessage, String detailedMessage) { | ||
super(detailedMessage); | ||
this.status = status; | ||
this.statusMessage = statusMessage; | ||
} | ||
|
||
public int getStatus() { | ||
return status; | ||
} | ||
|
||
public String getStatusMessage() { | ||
return statusMessage; | ||
} | ||
} |
27 changes: 27 additions & 0 deletions
27
src/main/java/io/fusionauth/http/UnprocessableContentException.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
/* | ||
* Copyright (c) 2025, FusionAuth, All Rights Reserved | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, | ||
* either express or implied. See the License for the specific | ||
* language governing permissions and limitations under the License. | ||
*/ | ||
package io.fusionauth.http; | ||
|
||
/** | ||
* Thrown when a multipart request cannot be parsed because a processor was not specified. | ||
* | ||
* @author Daniel DeGroff | ||
*/ | ||
public class UnprocessableContentException extends HTTPProcessingException { | ||
public UnprocessableContentException(String message) { | ||
super(422, "Unprocessable Content", message); | ||
} | ||
} |
53 changes: 53 additions & 0 deletions
53
src/main/java/io/fusionauth/http/io/DefaultMultipartFileManager.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
/* | ||
* Copyright (c) 2025, FusionAuth, All Rights Reserved | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, | ||
* either express or implied. See the License for the specific | ||
* language governing permissions and limitations under the License. | ||
*/ | ||
package io.fusionauth.http.io; | ||
|
||
import java.io.IOException; | ||
import java.nio.file.Files; | ||
import java.nio.file.Path; | ||
import java.util.ArrayList; | ||
import java.util.List; | ||
|
||
/** | ||
* Manage file creation for multipart streams. | ||
* | ||
* @author Daniel DeGroff | ||
*/ | ||
public class DefaultMultipartFileManager implements MultipartFileManager { | ||
private final String optionalPrefix; | ||
|
||
private final String optionalSuffix; | ||
|
||
private final Path tempDir; | ||
|
||
private final List<Path> tempFiles = new ArrayList<>(0); | ||
|
||
public DefaultMultipartFileManager(Path tempDir, String optionalPrefix, String optionalSuffix) { | ||
this.tempDir = tempDir; | ||
this.optionalPrefix = optionalPrefix; | ||
this.optionalSuffix = optionalSuffix; | ||
} | ||
|
||
public Path createTemporaryFile() throws IOException { | ||
Path tempFile = Files.createTempFile(tempDir, optionalPrefix, optionalSuffix); | ||
tempFiles.add(tempFile); | ||
return tempFile; | ||
} | ||
|
||
public List<Path> getTemporaryFiles() { | ||
return List.copyOf(tempFiles); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was just missing from the constructor. I could optionally go patch this in the maint. branch as well.