CGMES loading from zipped profiles inside a folder #3309
+325
−31
Conversation
This file contains 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
Signed-off-by: Giovanni Ferrari <[email protected]>
Signed-off-by: Giovanni Ferrari <[email protected]>
Signed-off-by: Giovanni Ferrari <[email protected]>
alicecaron
reviewed
Feb 14, 2025
cgmes/cgmes-model/src/main/java/com/powsybl/cgmes/model/CgmesOnDataSource.java
Outdated
Show resolved
Hide resolved
flo-dup
requested changes
Feb 19, 2025
commons/src/test/java/com/powsybl/commons/compress/ZipSecurityHelperTest.java
Outdated
Show resolved
Hide resolved
| if (fileExtension.equals(CompressionFormat.ZIP.getExtension())) { | ||
| ZipSecurityHelper.checkIfZipExtractionIsSafe(dataSource, n); | ||
| try (ZipInputStream is = new ZipInputStream(dataSource.newInputStream(n))) { | ||
| is.getNextEntry(); |
There was a problem hiding this comment.
we take the first entry only, shouldn't we check there's only one entry in the zip file? and throw a clear exception otherwise.
* Mutualize code to extract InputStream * try-with-resources through namespaceGetter function Signed-off-by: alicecaron <[email protected]> Co-authored-by: Florian Dupuy <[email protected]>
flo-dup
force-pushed
the
cgmes-load-zipped-profiles
branch
from
959f6f4 to
987c38f
Compare
alicecaron
approved these changes
Feb 19, 2025
olperr1
requested changes
Feb 19, 2025
commons/src/main/java/com/powsybl/commons/compress/ZipSecurityHelper.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Giovanni Ferrari <[email protected]>
Fix sonar issues Signed-off-by: Giovanni Ferrari <[email protected]>
Signed-off-by: Giovanni Ferrari <[email protected]>
Signed-off-by: Giovanni Ferrari <[email protected]>
|
alicecaron
reviewed
Feb 21, 2025
| ze = zipInputStream.getNextEntry(); | ||
| long entrySize = currentEntry.getCompressedSize(); | ||
| double compressionRatio = (double) totalSizeEntry / (double) entrySize; | ||
| if (compressionRatio > thresholdCompressionRatio) { |
There was a problem hiding this comment.
I tried with real files, and for a EQ xml zipped the compressed ratio is not sufficient for the current proposed THRESHOLD_RATIO=10. I had a compressionRatio of around 11. In consequence a java.io.UncheckedIOException error was thrown: Zip file extraction is not safe
Maybe it is necessar to increase this threshold because of the size of CGMES EQ files and poor ratio? @flo-dup @olperr1
There was a problem hiding this comment.
It is ok with THRESHOLD_RATIO = 12 in my case.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Please check if the PR fulfills these requirements
Does this PR already have an issue describing the problem?
#3259
Does this PR introduce a breaking change or deprecate an API?
Other information: