------------------------------------------------------------ revno: 17707 committer: Morten Olav Hansen <[email protected]> branch nick: dhis2 timestamp: Tue 2014-12-16 11:26:51 +0100 message: add system authority provider for apps, wip added: dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/AppsSystemAuthoritiesProvider.java modified: dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml
-- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== added file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/AppsSystemAuthoritiesProvider.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/AppsSystemAuthoritiesProvider.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/AppsSystemAuthoritiesProvider.java 2014-12-16 10:26:51 +0000 @@ -0,0 +1,63 @@ +package org.hisp.dhis.security.authority; + +/* + * Copyright (c) 2004-2014, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import org.apache.commons.lang3.StringUtils; +import org.hisp.dhis.appmanager.App; +import org.hisp.dhis.appmanager.AppManager; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +/** + * @author Morten Olav Hansen <[email protected]> + */ +public class AppsSystemAuthoritiesProvider implements SystemAuthoritiesProvider +{ + @Autowired + private AppManager appManager; + + @Override + public Collection<String> getSystemAuthorities() + { + List<String> authorities = new ArrayList<>(); + + for ( App app : appManager.getApps() ) + { + if ( !StringUtils.isEmpty( app.getName() ) ) + { + authorities.add( "See " + app.getName().trim() ); + } + } + + return authorities; + } +} === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2014-12-09 07:25:53 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2014-12-16 10:26:51 +0000 @@ -44,7 +44,7 @@ <sec:frame-options /> <sec:xss-protection /> </sec:headers> - + <sec:http-basic /> <sec:logout logout-url="/dhis-web-commons-security/logout.action" /> <sec:intercept-url pattern="/dhis-web-commons/i18nJavaScript.action" access="permitAll()" /> @@ -70,7 +70,7 @@ </bean> <!-- Security : Action --> - + <bean id="restrictOrganisationUnitsAction" class="org.hisp.dhis.security.action.RestrictOrganisationUnitsAction" scope="prototype"> <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" /> @@ -250,17 +250,19 @@ </bean> <bean id="org.hisp.dhis.security.authority.SystemAuthoritiesProvider" - class="org.hisp.dhis.security.authority.CachingSystemAuthoritiesProvider"> - <property name="source" ref="compositeSystemAuthoritiesProvider" /> - </bean> - - <bean id="compositeSystemAuthoritiesProvider" class="org.hisp.dhis.security.authority.CompositeSystemAuthoritiesProvider"> <property name="sources"> <set> - <ref bean="detectingSystemAuthoritiesProvider" /> - <ref bean="moduleSystemAuthoritiesProvider" /> - <ref bean="simpleSystemAuthoritiesProvider" /> + <bean class="org.hisp.dhis.security.authority.CachingSystemAuthoritiesProvider"> + <property name="source" ref="detectingSystemAuthoritiesProvider" /> + </bean> + <bean class="org.hisp.dhis.security.authority.CachingSystemAuthoritiesProvider"> + <property name="source" ref="moduleSystemAuthoritiesProvider" /> + </bean> + <bean class="org.hisp.dhis.security.authority.CachingSystemAuthoritiesProvider"> + <property name="source" ref="simpleSystemAuthoritiesProvider" /> + </bean> + <ref bean="appsSystemAuthoritiesProvider" /> </set> </property> </bean> @@ -318,4 +320,7 @@ </set> </property> </bean> + + <bean id="appsSystemAuthoritiesProvider" class="org.hisp.dhis.security.authority.AppsSystemAuthoritiesProvider" /> + </beans>
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
