Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fixes post ELY-810 (latest CS changes) #606

Merged
merged 2 commits into from Dec 16, 2016
Merged

fixes post ELY-810 (latest CS changes) #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9740dee
[ELY-833] AtomicFileOutputStream causes NPE when created for file in …
pskopek Dec 15, 2016
64b9f34
[ELY-834] KeyStoreCredentialStore has to implement getAliases method
pskopek Dec 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/main/java/org/wildfly/security/credential/store/impl/KeyStoreCredentialStore.java
View file
Open in desktop
Expand Up @@ -53,6 +53,7 @@
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.regex.Matcher;
Expand Down Expand Up @@ -150,6 +151,7 @@ public void initialize(final Map<String, String> attributes, final CredentialSto
final String locationName = attributes.get("location");
this.location = locationName == null ? null : Paths.get(locationName);
load(attributes.getOrDefault("keyStoreType", KeyStore.getDefaultType()));
initialized = true;
}
}

Expand Down Expand Up @@ -713,6 +715,20 @@ public void flush() throws CredentialStoreException {
}
}

/**
* Returns credential aliases stored in this store as {@code Set<String>}.
* <p>
* It is not mandatory to override this method (throws {@link UnsupportedOperationException} by default).
*
* @return {@code Set<String>} of all keys stored in this store
* @throws UnsupportedOperationException when this method is not supported by the underlying credential store
* @throws CredentialStoreException if there is any problem with internal store
*/
@Override
public Set<String> getAliases() throws UnsupportedOperationException, CredentialStoreException {
return cache.keySet();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably should have either made a copy or made it unmodifiable. I've made a note to fix this later.

}

private Hold lockForRead() {
readWriteLock.readLock().lock();
return () -> readWriteLock.readLock().unlock();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/wildfly/security/util/AtomicFileOutputStream.java
View file
Open in desktop
Expand Up @@ -51,7 +51,7 @@ public AtomicFileOutputStream(final File file) throws IOException {

public AtomicFileOutputStream(final Path path) throws IOException {
final Path parent = path.getParent();
if (parent.getNameCount() != 0 && ! Files.exists(parent)) {
if (parent != null && parent.getNameCount() != 0 && ! Files.exists(parent)) {
Files.createDirectories(parent);
}
current = new OpenState(Files.newOutputStream(path.resolveSibling(path.getFileName() + ".new"), CREATE, TRUNCATE_EXISTING), path);
Expand Down