Author: rareddy Date: 2011-11-09 13:09:23 -0500 (Wed, 09 Nov 2011) New Revision: 3623 Modified: trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml trunk/documentation/admin-guide/src/main/docbook/en-US/content/security.xml trunk/engine/src/main/java/org/teiid/dqp/service/SessionService.java trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java Log: TEIID-1610: rename public facing proeprty from krb5 to gss Modified: trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml =================================================================== --- trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml 2011-11-09 18:03:26 UTC (rev 3622) +++ trunk/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml 2011-11-09 18:09:23 UTC (rev 3623) @@ -16,7 +16,7 @@ <!-- authentication type are CLEARTEXT, GSS (default:CLEARTEXT) --> <property name="authenticationType">CLEARTEXT</property> <!-- When authenticationType=GSS, then it requires a kerberos security domain to authorize first before teiid-security takes over --> - <property name="krb5SecurityDomain">teiid-krb5</property> + <property name="gssSecurityDomain">teiid-krb5</property> </bean> <bean name="BufferService" class="org.teiid.services.BufferServiceImpl"> Modified: trunk/documentation/admin-guide/src/main/docbook/en-US/content/security.xml =================================================================== --- trunk/documentation/admin-guide/src/main/docbook/en-US/content/security.xml 2011-11-09 18:03:26 UTC (rev 3622) +++ trunk/documentation/admin-guide/src/main/docbook/en-US/content/security.xml 2011-11-09 18:09:23 UTC (rev 3623) @@ -183,7 +183,7 @@ <programlisting><![CDATA[<!-- Sets the authentication Type --> <property name="authenticationType">GSS</property> <!-- Security domain used for kerberos authentication --> -<property name="krb5SecurityDomain">teiid-krb5</property>]]></programlisting> +<property name="gssSecurityDomain">teiid-krb5</property>]]></programlisting> Now we need to define a security domain context for kerberos with the name mentioned in above. Since kerberos authorization cannot define authorization roles, we'll define them using another login context. Modified: trunk/engine/src/main/java/org/teiid/dqp/service/SessionService.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/service/SessionService.java 2011-11-09 18:03:26 UTC (rev 3622) +++ trunk/engine/src/main/java/org/teiid/dqp/service/SessionService.java 2011-11-09 18:09:23 UTC (rev 3623) @@ -146,7 +146,7 @@ AuthenticationType getAuthType(); - String getKrb5SecurityDomain(); + String getGssSecurityDomain(); void associateSubjectInContext(String securityDomain, Subject subject); Modified: trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java 2011-11-09 18:03:26 UTC (rev 3622) +++ trunk/runtime/src/main/java/org/teiid/services/SessionServiceImpl.java 2011-11-09 18:09:23 UTC (rev 3623) @@ -82,7 +82,7 @@ private long sessionMaxLimit = DEFAULT_MAX_SESSIONS; private long sessionExpirationTimeLimit = DEFAULT_SESSION_EXPIRATION; private String authenticationType = AuthenticationType.CLEARTEXT.name(); - private String krb5SecurityDomain; + private String gssSecurityDomain; /* * Injected state @@ -438,12 +438,12 @@ return this.securityHelper.getSubjectInContext(securityDomain); } - public void setKrb5SecurityDomain(String domain) { - this.krb5SecurityDomain = domain; + public void setGssSecurityDomain(String domain) { + this.gssSecurityDomain = domain; } @Override - public String getKrb5SecurityDomain(){ - return this.krb5SecurityDomain; + public String getGssSecurityDomain(){ + return this.gssSecurityDomain; } } Modified: trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java 2011-11-09 18:03:26 UTC (rev 3622) +++ trunk/runtime/src/main/java/org/teiid/transport/LogonImpl.java 2011-11-09 18:09:23 UTC (rev 3623) @@ -66,8 +66,8 @@ } public LogonResult logon(Properties connProps) throws LogonException, TeiidComponentException, CommunicationException { - if (this.service.getKrb5SecurityDomain() != null && connProps.get(ILogon.KRB5TOKEN) != null) { - Subject user = this.service.getSubjectInContext(this.service.getKrb5SecurityDomain()); + if (this.service.getGssSecurityDomain() != null && connProps.get(ILogon.KRB5TOKEN) != null) { + Subject user = this.service.getSubjectInContext(this.service.getGssSecurityDomain()); if (user == null) { throw new LogonException(RuntimePlugin.Util.getString("krb5_user_not_found")); //$NON-NLS-1$ } @@ -161,7 +161,7 @@ String password = connProps.getProperty(TeiidURL.CONNECTION.PASSWORD); try { - String securityDomain = service.getKrb5SecurityDomain(); + String securityDomain = service.getGssSecurityDomain(); if (securityDomain == null) { throw new LogonException(RuntimePlugin.Util.getString("no_security_domains")); //$NON-NLS-1$ }