Merged
Conversation
… from a variety of sources, as well as supporting password decryption for passwords stored in encrypted form
… from a variety of sources, as well as supporting password decryption for passwords stored in encrypted form
… from a variety of sources, as well as supporting password decryption for passwords stored in encrypted form
…wave into GEOWAVE-811-rebase
rfecher
requested changes
Apr 25, 2017
| String value = existingProps.getProperty(storeFieldName); | ||
| String encryptedValue = value; | ||
| try { | ||
| encryptedValue = new SecurityUtils().encryptAndHexEncodeValue(value); |
Contributor
There was a problem hiding this comment.
static method and pass in resourceLocation
|
|
||
| final String password = (System.getProperty("password") != null) ? System.getProperty("password") : "password"; | ||
| // GeoWave:811 - providing ability to support encrypted passwords | ||
| final String password = new SecurityUtils() |
Contributor
There was a problem hiding this comment.
static method and pass in resourceLocation
| else { | ||
| try { | ||
| // if password in config props is encrypted, need to decrypt it | ||
| pass = new SecurityUtils().decryptHexEncodedValue(pass); |
Contributor
There was a problem hiding this comment.
static method and pass in resourceLocation
| this.password = password; | ||
| // GeoWave:811 - providing ability to support encrypted passwords | ||
| try { | ||
| this.password = new SecurityUtils().decryptHexEncodedValue(password); |
Contributor
There was a problem hiding this comment.
static method and pass in resourceLocation
| // final String password = (System.getProperty("password") != null) ? | ||
| // System.getProperty("password") : "password"; | ||
| // GeoWave:811 - providing ability to support encrypted passwords | ||
| final String password = new SecurityUtils() |
Contributor
There was a problem hiding this comment.
static method and pass in resourceLocation
| ConfigOptions.writeProperties( | ||
| getGeoWaveConfigFile(params), | ||
| configProps); | ||
| System.out.println("GeoServer Config Saved"); |
Contributor
There was a problem hiding this comment.
we can log if necessary, is there a reason for system.out here?
| String encryptedValue = new SecurityUtils().encryptAndHexEncodeValue( | ||
| rawInput, | ||
| tokenFile.getCanonicalPath()); | ||
| System.out.println("encryptedValue: " + encryptedValue); |
Contributor
There was a problem hiding this comment.
we can log if necessary, is there a reason for system.out here?
| String decryptedValue = new SecurityUtils().decryptHexEncodedValue( | ||
| encryptedValue, | ||
| tokenFile.getCanonicalPath()); | ||
| System.out.println("decryptedValue: " + decryptedValue); |
Contributor
There was a problem hiding this comment.
we can log if necessary, is there a reason for system.out here?
| gsConfig); | ||
| gsConfigProperties); | ||
|
|
||
| System.out.println("GeoServer Config Saved"); |
Contributor
There was a problem hiding this comment.
we can log if necessary, is there a reason for system.out here?
Contributor
Author
There was a problem hiding this comment.
I can switch to a log statement. The system.out was there previously and I didn't think to change it
| + File.separator + ConfigOptions.GEOWAVE_CACHE_FILE)); | ||
| } | ||
|
|
||
| public String getUrl() { |
Contributor
There was a problem hiding this comment.
now that we are checking for https within the client, it seems like it may make sense to use https:// on line 124 if we detect a port that ends with 443
…ng un-used methods. Adding a new URLUtils class which helps reduce redundant URL validation in a few places across codebase. Also adding feature to allow encryption to be enabled or disabled through configs. At this point, encryption should be done only when writing to the properties file, and then decrypted when loading from the properties. This should reduce the places where we are trying to decrypt values
rfecher
approved these changes
Apr 27, 2017
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.