Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] added ComponentContainer.getRealm(Certificate) 

- instead of throwing an exception if the realm property is missing on
the certificate, we first see if the default realm is available
This commit is contained in:
Robert von Burg 2015-04-02 20:38:50 +02:00
parent 318b186641
commit c307102e33
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
li.strolch.agent/src/main/java/li/strolch/agent/api/ComponentContainer.java
View File

@ -65,8 +65,8 @@ public interface ComponentContainer {
* @return the {@link StrolchRealm}
*
* @throws StrolchException
* if the user does not have a {@link StrolchConstants#PROP_REALM} property configured, or if the realm
* does not exist with the found value
* if the user does not have a {@link StrolchConstants#PROP_REALM} property configured, and the default
* realm is not configured, or if the realm does not exist with the found value
*/
public abstract StrolchRealm getRealm(Certificate certificate) throws StrolchException;

10
li.strolch.agent/src/main/java/li/strolch/agent/impl/ComponentContainerImpl.java
View File

@ -114,9 +114,13 @@ public class ComponentContainerImpl implements ComponentContainer {
String realmName = certificate.getProperty(StrolchConstants.PROP_REALM);
if (StringHelper.isEmpty(realmName)) {
String msg = "The User {0} is missing the property {1}";
throw new StrolchException(
MessageFormat.format(msg, certificate.getUsername(), StrolchConstants.PROP_REALM));
if (getRealmNames().contains(StrolchConstants.DEFAULT_REALM)) {
realmName = StrolchConstants.DEFAULT_REALM;
} else {
String msg = "The User {0} is missing the property {1} and the Realm {2} can not be used as it does not exist!";
throw new StrolchException(MessageFormat.format(msg, certificate.getUsername(),
StrolchConstants.PROP_REALM, StrolchConstants.DEFAULT_REALM));
}
}
try {