summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2012-10-09 20:00:09 (GMT)
committer mconway <michael.c.conway@gmail.com>2012-10-09 20:00:09 (GMT)
commit395046476ceb3eacf9f274d43d1d6b62f4bd4ce0 (patch)
tree7550c944a2268232398caf8ec869241568f30701
parente45a90ed4aa21555ae1a202a13f69f0e92daa84c (diff)
downloadQCG-Data-395046476ceb3eacf9f274d43d1d6b62f4bd4ce0.zip
QCG-Data-395046476ceb3eacf9f274d43d1d6b62f4bd4ce0.tar.gz
QCG-Data-395046476ceb3eacf9f274d43d1d6b62f4bd4ce0.tar.bz2
[#870] jargon support for PAM
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java2
-rw-r--r--idrop-web/grails-app/conf/Config.groovy9
-rw-r--r--idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy12
3 files changed, 8 insertions, 15 deletions
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
index b68db54..0fda6b4 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
+++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
@@ -1,4 +1,4 @@
package org.irods.jargon.idrop.lite;
public final class Version {
- public static String VERSION="20121009-0904";
+ public static String VERSION="20121009-1557";
}
diff --git a/idrop-web/grails-app/conf/Config.groovy b/idrop-web/grails-app/conf/Config.groovy
index a1ec5bc..95b50a3 100644
--- a/idrop-web/grails-app/conf/Config.groovy
+++ b/idrop-web/grails-app/conf/Config.groovy
@@ -33,7 +33,6 @@ environments {
idrop.config.preset.zone="lifelibZone"
idrop.config.preset.resource="lifelibResc1"
idrop.config.preset.authScheme="Standard"
-
*/
@@ -50,7 +49,7 @@ environments {
idrop.config.idrop.lite.use.applet.dir=false
*/
-idrop.config.idrop.lite.applet.jar="idrop-lite-1.0.2-jar-with-dependencies.jar"
+idrop.config.idrop.lite.applet.jar="idrop-lite-1.0.1-jar-with-dependencies.jar"
idrop.config.idrop.lite.codebase="http://iren-web.renci.org/idrop-release"
idrop.config.idrop.lite.use.applet.dir=false
@@ -155,10 +154,8 @@ grails.validateable.packages = ['org.irods']
// log4j configuration
log4j = {
-
- appenders {
- 'null' name:'stacktrace'
- }
+
+ appenders { 'null' name:'stacktrace' }
root {
warn()
diff --git a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy
index 09feb97..7eff1f0 100644
--- a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy
+++ b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy
@@ -4,7 +4,6 @@ import org.irods.jargon.core.connection.IRODSAccount
import org.irods.jargon.core.connection.auth.AuthResponse
import org.irods.jargon.core.exception.JargonException
import org.irods.jargon.core.pub.IRODSAccessObjectFactory
-import org.irods.jargon.core.pub.UserAO
class LoginController {
@@ -62,7 +61,7 @@ class LoginController {
if (presetResource) {
loginCommand.defaultStorageResource = presetResource
}
-
+
if (presetAuthScheme) {
log.info("preset auth scheme is:${presetAuthScheme}")
loginCommand.authMethod = presetAuthScheme
@@ -132,9 +131,9 @@ class LoginController {
loginCommand.zone,
resource)
}
-
+
log.info("login mode: ${loginCommand.authMethod}")
-
+
if (loginCommand.authMethod == "Standard") {
irodsAccount.authenticationScheme = IRODSAccount.AuthScheme.STANDARD
} else if (loginCommand.authMethod == "PAM") {
@@ -148,10 +147,7 @@ class LoginController {
log.info("built irodsAccount:${irodsAccount}")
AuthResponse authResponse
try {
- UserAO userAO = irodsAccessObjectFactory
- .getUserAO(irodsAccount)
- authResponse = irodsAccessObjectFactory.irodsSession.currentConnection(irodsAccount).authResponse
- // close?
+ authResponse = irodsAccessObjectFactory.authenticateIRODSAccount(irodsAccount)
} catch (JargonException e) {
log.error("unable to authenticate, JargonException", e)