Harden KeyContent against different publicKey-file line-delimiters #1083
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
Codecov Report
@@ Coverage Diff @@
## master #1083 +/- ##
============================================
- Coverage 33.23% 33.20% -0.03%
Complexity 356 356
============================================
Files 1161 1161
Lines 25700 25699 -1
Branches 1589 1588 -1
============================================
- Hits 8541 8534 -7
- Misses 16654 16660 +6
Partials 505 505
Continue to review full report at Codecov.
|
HannesWell
force-pushed
the
keyContent
branch
2 times, most recently
from
195f441 to
f41b4dd
Compare
|
@eparovyshnaya can you please review this one? I already created a test case. |
eparovyshnaya
requested changes
Jul 15, 2022
There was a problem hiding this comment.
Thank for your effort, @HannesWell
Needs a bit of redesign.
bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/KeyContent.java
Outdated
Show resolved
Hide resolved
....eclipse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/io/SafePayloadTest.java
Outdated
Show resolved
Hide resolved
....eclipse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/io/SafePayloadTest.java
Outdated
Show resolved
Hide resolved
....eclipse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/io/SafePayloadTest.java
Outdated
Show resolved
Hide resolved
eparovyshnaya
requested changes
Jul 16, 2022
.../src/org/eclipse/passage/lic/net/tests/io/TestKeyKeeperWithOppositeLineDelimiterFactory.java
Outdated
Show resolved
Hide resolved
.../src/org/eclipse/passage/lic/net/tests/io/TestKeyKeeperWithOppositeLineDelimiterFactory.java
Outdated
Show resolved
Hide resolved
.../src/org/eclipse/passage/lic/net/tests/io/TestKeyKeeperWithOppositeLineDelimiterFactory.java
Outdated
Show resolved
Hide resolved
...pse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/io/TestKeyKeeperFactory.java
Outdated
Show resolved
Hide resolved
....eclipse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/io/SafePayloadTest.java
Outdated
Show resolved
Hide resolved
....eclipse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/io/SafePayloadTest.java
Outdated
Show resolved
Hide resolved
...pse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/io/TestKeyKeeperFactory.java
Outdated
Show resolved
Hide resolved
HannesWell
force-pushed
the
keyContent
branch
2 times, most recently
from
5b4c4e6 to
69a92c7
Compare
|
I tried to address your remarks as good as possible. |
eparovyshnaya
requested changes
Jul 16, 2022
...ests/src/org/eclipse/passage/lic/net/tests/io/KeyKeeperWithOppositeLineDelimiterFactory.java
Outdated
Show resolved
Hide resolved
...pse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/io/TestKeyKeeperFactory.java
Outdated
Show resolved
Hide resolved
HannesWell
force-pushed
the
keyContent
branch
2 times, most recently
from
f56ba9b to
120feef
Compare
eparovyshnaya
requested changes
Jul 18, 2022
There was a problem hiding this comment.
@HannesWell nice work!
one final touch, and it's ready for merge.
...ests/src/org/eclipse/passage/lic/net/tests/io/KeyKeeperWithOppositeLineDelimiterFactory.java
Outdated
Show resolved
Hide resolved
bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/KeyContent.java
Show resolved
Hide resolved
...e.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/io/SimpleKeyKeeperFactory.java
Outdated
Show resolved
Hide resolved
...ests/src/org/eclipse/passage/lic/net/tests/io/KeyKeeperWithOppositeLineDelimiterFactory.java
Outdated
Show resolved
Hide resolved
HannesWell
force-pushed
the
keyContent
branch
2 times, most recently
from
69c9fe0 to
4930ca2
Compare
eparovyshnaya
requested changes
Jul 19, 2022
...c.net.tests/src/org/eclipse/passage/lic/net/tests/io/KeyKeeperWithOppositeLineDelimiter.java
Outdated
Show resolved
Hide resolved
...c.net.tests/src/org/eclipse/passage/lic/net/tests/io/KeyKeeperWithOppositeLineDelimiter.java
Outdated
Show resolved
Hide resolved
....eclipse.passage.lic.net.tests/src/org/eclipse/passage/lic/net/tests/io/SafePayloadTest.java
Outdated
Show resolved
Hide resolved
eparovyshnaya
approved these changes
Jul 19, 2022
|
Thank you, too. |
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.
The class
KeyContentreads the entire content of a publicKey-file and returns its raw content as byte-array.This is problematic if the publicKey-file on server- and client-site use different line endings.
This can happen for example if the file is under git version-control and git is configured to use platform-specific line-endings for text files.
This PR attempts to fix this issue by effectively ignoring line-feed and carriage-return characters when reading the file-content.
Using a
BufferedReadermakes the method even a bit more compact.The additional test-case outlines the issue and only passes with the change in this PR.