summaryrefslogtreecommitdiffstats
path: root/base/tks
diff options
context:
space:
mode:
authorFraser Tweedale <ftweedal@redhat.com>2016-01-14 16:13:26 +1100
committerFraser Tweedale <ftweedal@redhat.com>2016-02-15 14:38:06 +1000
commitae975289fcd669e122589cfd1a7c82e0b28f733e (patch)
tree97a15170931f2e21216c3f053604e1f882cdc55d /base/tks
parentf6177fede9d1b688f0519953ec14839d513a6e2c (diff)
downloadpki-ae975289fcd669e122589cfd1a7c82e0b28f733e.tar.gz
pki-ae975289fcd669e122589cfd1a7c82e0b28f733e.tar.xz
pki-ae975289fcd669e122589cfd1a7c82e0b28f733e.zip
Weaken PKIPrincipal to superclass in several places
In several places we are casting a `Principal' to `PKIPrincpal', when `GenericPrincpal' or even no cast will suffice. In upcoming external authentication support externally authenticated principals will not be instances of `PKIPrincipal', so weaken assumptions about type of the principal where possible. Part of: https://fedorahosted.org/pki/ticket/1359
Diffstat (limited to 'base/tks')
-rw-r--r--base/tks/src/org/dogtagpki/server/tks/rest/TPSConnectorService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/tks/src/org/dogtagpki/server/tks/rest/TPSConnectorService.java b/base/tks/src/org/dogtagpki/server/tks/rest/TPSConnectorService.java
index 93cd411cb..bc655d6d0 100644
--- a/base/tks/src/org/dogtagpki/server/tks/rest/TPSConnectorService.java
+++ b/base/tks/src/org/dogtagpki/server/tks/rest/TPSConnectorService.java
@@ -5,6 +5,7 @@ import java.net.URI;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
+import java.security.Principal;
import java.security.cert.X509Certificate;
import java.util.Arrays;
import java.util.Collection;
@@ -37,7 +38,6 @@ import com.netscape.certsrv.system.TPSConnectorResource;
import com.netscape.certsrv.tps.cert.TPSCertResource;
import com.netscape.certsrv.usrgrp.IUGSubsystem;
import com.netscape.certsrv.usrgrp.IUser;
-import com.netscape.cms.realm.PKIPrincipal;
import com.netscape.cms.servlet.base.PKIService;
import com.netscape.cmsutil.crypto.CryptoUtil;
import com.netscape.cmsutil.util.Utils;
@@ -326,7 +326,7 @@ public class TPSConnectorService extends PKIService implements TPSConnectorResou
throw new PKIException("Bad TPS connection configuration: userid not defined");
}
- PKIPrincipal principal = (PKIPrincipal) servletRequest.getUserPrincipal();
+ Principal principal = servletRequest.getUserPrincipal();
if (principal == null) {
throw new UnauthorizedException("User credentials not provided");
}