Skip to content
This repository has been archived by the owner on Sep 23, 2020. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
fix for scheme passthrough patch
  • Loading branch information
timf committed Jul 9, 2010
1 parent 874031e commit 939b5a1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 16 deletions.
Expand Up @@ -33,11 +33,11 @@
class="org.globus.workspace.sqlauthz.AuthzDecisionLogic">

<constructor-arg ref="other.AuthzDataSource" />
<constructor-arg value="$GLOBAL{allow.other.schemes}" />

<property name="repoDir" value="$CUMULUS{cumulus.repo.dir}" />
<property name="repoHost" value="$SSH{service.sshd.contact.string}" />
<property name="repoScheme" value="scp://" />
<property name="schemePassthrough" value="$GLOBAL{allow.other.schemes}" />
</bean>

<bean id="nimbus-rm.service.binding.RepoAdaptor"
Expand Down
Expand Up @@ -33,11 +33,11 @@
class="org.globus.workspace.sqlauthz.AuthzDecisionLogic">

<constructor-arg ref="other.AuthzDataSource" />
<constructor-arg value="$GLOBAL{allow.other.schemes}" />

<property name="repoDir" value="$CUMULUS{cumulus.repo.dir}" />
<property name="repoHost" value="$SSH{service.sshd.contact.string}" />
<property name="repoScheme" value="scp://" />
<property name="schemePassthrough" value="$GLOBAL{allow.other.schemes}" />
</bean>

<bean id="nimbus-rm.service.binding.RepoAdaptor"
Expand Down
Expand Up @@ -37,9 +37,13 @@ public class AuthzDecisionLogic extends DecisionLogic
private boolean schemePassthrough;

public AuthzDecisionLogic(
DataSource ds)
DataSource ds,
String schemePassthroughStr)
{
this.authDB = new AuthzDBAdapter(ds);
this.schemePassthrough =
schemePassthroughStr != null
&& schemePassthroughStr.trim().equalsIgnoreCase("true");
}

public String translateExternaltoInternal(
Expand Down Expand Up @@ -414,16 +418,4 @@ public void unpropagationFinished(
throw new WorkspaceException("Workspace database exception occured ", wsdbex);
}
}

public void setSchemePassthrough(String schemePassthroughStr)
{
this.schemePassthrough =
schemePassthroughStr != null
&& schemePassthroughStr.trim().equalsIgnoreCase("true");
}

public boolean getSchemePassthrough()
{
return schemePassthrough;
}
}
Expand Up @@ -33,11 +33,11 @@
class="org.globus.workspace.sqlauthz.AuthzDecisionLogic">

<constructor-arg ref="other.AuthzDataSource" />
<constructor-arg value="$GLOBAL{allow.other.schemes}" />

<property name="repoDir" value="$CUMULUS{cumulus.repo.dir}" />
<property name="repoHost" value="$SSH{service.sshd.contact.string}" />
<property name="repoScheme" value="scp://" />
<property name="schemePassthrough" value="$GLOBAL{allow.other.schemes}" />
</bean>

<bean id="nimbus-rm.service.binding.RepoAdaptor"
Expand Down

0 comments on commit 939b5a1

Please sign in to comment.