Permalink
Browse files

cleanup of scheme passthrough attempt. Hmm duplicated xml

  • Loading branch information...
timf committed Jul 9, 2010
1 parent 90fc703 commit a2f313d7712aa4e7aae0b65709845e843acca53b
@@ -71,11 +71,13 @@ allow.static.addresses=false
# POLICY: allow.other.schemes
#
-# If 'true' this allows clients to use file URL schemes other than "cumulus://" or
-# "file://" and it leaves it up to workspace-control or other special mechanisms
-# (like "allowed.http.hosts" configuration below) to decide on authorization question.
+# If 'true' this allows clients to use file URL schemes other than "cumulus://"
+# or file://" for images. It leaves it up to workspace-control or other special
+# mechanisms (like "allowed.http.hosts" configuration below) to decide on
+# the authorization question.
+
+allow.other.schemes=false
-allow.other.propagation.schemes=false
# POLICY: allowed.http.hosts
#
@@ -37,6 +37,7 @@
<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"
@@ -37,7 +37,7 @@
<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.propagation.schemes}" />
+ <property name="schemePassthrough" value="$GLOBAL{allow.other.schemes}" />
</bean>
<bean id="nimbus-rm.service.binding.RepoAdaptor"
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+ <!--
+
+ If this is your "authz-callout-ACTIVE.xml" file, then you have enabled
+ the "groupauthz" plugin.
+
+ -->
+
+ <import resource="main.conflocator.xml" />
+ <!-- <import resource="authz-callout-groupauthz.xml" /> cannot quite inheirt :-( -->
+
+ <bean id="other.AuthzDataSource"
+ class="org.apache.commons.dbcp.BasicDataSource">
+ <property name="driverClassName" value="org.sqlite.JDBC" />
+ <property name="maxActive" value="10" />
+ <property name="maxIdle" value="4" />
+ <property name="maxWait" value="2000" />
+ <property name="poolPreparedStatements" value="true" />
+
+ <property name="url"
+ value="jdbc:sqlite://$CUMULUS{cumulus.authz.db}" />
+ <property name="username" value="nimbus"/>
+ <property name="password" value="nimbus"/>
+ </bean>
+
+ <bean id="nimbus-rm.service.binding.Decider"
+ class="org.globus.workspace.sqlauthz.AuthzDecisionLogic">
+
+ <constructor-arg ref="other.AuthzDataSource" />
+
+ <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"
+ class="org.globus.workspace.sqlauthz.CumulusRepoFileSystemAdaptor">
+
+ <constructor-arg ref="nimbus-rm.service.binding.Decider" />
+ </bean>
+
+
+ <bean id="nimbus-rm.service.binding.AuthorizationCallout"
+ class="org.globus.workspace.sqlauthz.SqlAuthz"
+ init-method="validate">
+
+ <constructor-arg ref="nimbus-rm.service.binding.Decider" />
+
+ <property name="def01"
+ value="$COMMON{conf.dir}/group-authz/group01.properties" />
+ <property name="group01"
+ value="$COMMON{conf.dir}/group-authz/group01.txt" />
+
+ <property name="def02"
+ value="$COMMON{conf.dir}/group-authz/group02.properties" />
+ <property name="group02"
+ value="$COMMON{conf.dir}/group-authz/group02.txt" />
+
+ <property name="def03"
+ value="$COMMON{conf.dir}/group-authz/group03.properties" />
+ <property name="group03"
+ value="$COMMON{conf.dir}/group-authz/group03.txt" />
+
+ <property name="def04"
+ value="$COMMON{conf.dir}/group-authz/group04.properties" />
+ <property name="group04"
+ value="$COMMON{conf.dir}/group-authz/group04.txt" />
+
+ <property name="def05"
+ value="$COMMON{conf.dir}/group-authz/group05.properties" />
+ <property name="group05"
+ value="$COMMON{conf.dir}/group-authz/group05.txt" />
+
+ <property name="def06"
+ value="$COMMON{conf.dir}/group-authz/group06.properties" />
+ <property name="group06"
+ value="$COMMON{conf.dir}/group-authz/group06.txt" />
+
+ <property name="def07"
+ value="$COMMON{conf.dir}/group-authz/group07.properties" />
+ <property name="group07"
+ value="$COMMON{conf.dir}/group-authz/group07.txt" />
+
+ <property name="def08"
+ value="$COMMON{conf.dir}/group-authz/group08.properties" />
+ <property name="group08"
+ value="$COMMON{conf.dir}/group-authz/group08.txt" />
+
+ <property name="def09"
+ value="$COMMON{conf.dir}/group-authz/group09.properties" />
+ <property name="group09"
+ value="$COMMON{conf.dir}/group-authz/group09.txt" />
+
+ <property name="def10"
+ value="$COMMON{conf.dir}/group-authz/group10.properties" />
+ <property name="group10"
+ value="$COMMON{conf.dir}/group-authz/group10.txt" />
+
+ <property name="def11"
+ value="$COMMON{conf.dir}/group-authz/group11.properties" />
+ <property name="group11"
+ value="$COMMON{conf.dir}/group-authz/group11.txt" />
+
+ <property name="def12"
+ value="$COMMON{conf.dir}/group-authz/group12.properties" />
+ <property name="group12"
+ value="$COMMON{conf.dir}/group-authz/group12.txt" />
+
+ <property name="def13"
+ value="$COMMON{conf.dir}/group-authz/group13.properties" />
+ <property name="group13"
+ value="$COMMON{conf.dir}/group-authz/group13.txt" />
+
+ <property name="def14"
+ value="$COMMON{conf.dir}/group-authz/group14.properties" />
+ <property name="group14"
+ value="$COMMON{conf.dir}/group-authz/group14.txt" />
+
+ <property name="def15"
+ value="$COMMON{conf.dir}/group-authz/group15.properties" />
+ <property name="group15"
+ value="$COMMON{conf.dir}/group-authz/group15.txt" />
+
+
+ </bean>
+
+</beans>

0 comments on commit a2f313d

Please sign in to comment.