Project

General

Profile

« Previous | Next » 

Revision 61619

[Authorization Library]: Add dnet45 parert

View differences:

modules/uoa-authorization-library/trunk/src/main/java/eu/dnetlib/uoaauthorizationlibrary/controllers/AuthorizationLibraryCheckDeployController.java
40 40
        response.put("authorization.security.userInfoUrl", securityConfig.getUserInfoUrl());
41 41
        response.put("authorization.security.originServer", securityConfig.getOriginServer());
42 42

  
43
        if(globalVars.date != null) {
44
            response.put("Date of deploy", globalVars.date.toString());
43
        if(GlobalVars.date != null) {
44
            response.put("Date of deploy", GlobalVars.date.toString());
45 45
        }
46 46
        if(globalVars.getBuildDate() != null) {
47 47
            response.put("Date of build", globalVars.getBuildDate());
modules/uoa-authorization-library/trunk/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/AuthorizationConfiguration.java
4 4
import org.springframework.context.annotation.*;
5 5

  
6 6
@Configuration
7
//@PropertySources({
8
//        @PropertySource("classpath:authorization.properties"),
9
//        @PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true)
10
//})
11 7
@EnableConfigurationProperties({SecurityConfig.class, GlobalVars.class})
12 8
@ComponentScan(basePackages = { "eu.dnetlib.uoaauthorizationlibrary" })
13 9
public class AuthorizationConfiguration { }
modules/uoa-authorization-library/trunk/src/main/java/eu/dnetlib/uoaauthorizationlibrary/security/AuthorizationService.java
9 9

  
10 10
import java.util.ArrayList;
11 11
import java.util.List;
12
import java.util.stream.Collectors;
12 13

  
13 14
@Component(value = "AuthorizationService")
14 15
public class AuthorizationService {
......
53 54
        return mapType(type, false).toUpperCase() + "_" + id.toUpperCase();
54 55
    }
55 56

  
57
    public boolean isPortalAdmin() {
58
        return getRoles().stream().anyMatch(authority -> authority.equalsIgnoreCase(PORTAL_ADMIN));
59
    }
60

  
61
    public boolean isCurator(String type) {
62
        return getRoles().stream().anyMatch(authority -> authority.equalsIgnoreCase(curator(type)));
63
    }
64

  
65
    public boolean isManager(String type, String id) {
66
        return getRoles().stream().anyMatch(authority -> authority.equalsIgnoreCase(manager(type, id)));
67
    }
68

  
69
    public boolean isMember(String type, String id) {
70
        return getRoles().stream().anyMatch(authority -> authority.equalsIgnoreCase(member(type, id)));
71
    }
72

  
56 73
    public List<String> getRoles() {
57 74
        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
58 75
        if (authentication != null) {
59
            List<GrantedAuthority> authorities = (List<GrantedAuthority>) authentication.getAuthorities();
60
            if (authorities != null) {
61
                List<String> roles = new ArrayList<>();
62
                authorities.forEach((authority) -> {
63
                    roles.add(authority.getAuthority());
64
                });
65
                return roles;
66
            }
76
            return authentication.getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList());
67 77
        }
68
        return null;
78
        return new ArrayList<>();
69 79
    }
70 80

  
71 81
    public String getAaiId() {
modules/uoa-authorization-library/trunk/src/main/resources/application.properties
1
server.port=9090
modules/uoa-authorization-library/trunk/pom.xml
2 2
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3 3
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4 4
	<modelVersion>4.0.0</modelVersion>
5

  
6
	<groupId>eu.dnetlib</groupId>
5
	<parent>
6
		<groupId>eu.dnetlib</groupId>
7
		<artifactId>dnet45-parent</artifactId>
8
		<version>1.0.0</version>
9
	</parent>
7 10
	<artifactId>uoa-authorization-library</artifactId>
8 11
	<version>1.0.0-SNAPSHOT</version>
9 12
	<packaging>jar</packaging>
10

  
13
	<scm>
14
		<developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/uoa-authorization-library/trunk</developerConnection>
15
	</scm>
11 16
	<name>uoa-authorization-library</name>
12 17

  
13
	<parent>
14
		<groupId>org.springframework.boot</groupId>
15
		<artifactId>spring-boot-starter-parent</artifactId>
16
		<version>1.5.8.RELEASE</version>
17
		<relativePath/> <!-- lookup parent from repository -->
18
	</parent>
19

  
20 18
	<properties>
21 19
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
22 20
		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
......
24 22
        <timestampAuthorizationLibrary>${maven.build.timestamp}</timestampAuthorizationLibrary>
25 23
        <maven.build.timestamp.format>E MMM dd HH:mm:ss z yyyy</maven.build.timestamp.format>
26 24
	</properties>
27

  
25
	<dependencyManagement>
26
		<dependencies>
27
			<dependency>
28
				<groupId>org.springframework.boot</groupId>
29
				<artifactId>spring-boot-dependencies</artifactId>
30
				<version>1.5.8.RELEASE</version>
31
				<type>pom</type>
32
				<scope>import</scope>
33
			</dependency>
34
		</dependencies>
35
	</dependencyManagement>
28 36
	<dependencies>
29 37
		<dependency>
30 38
			<groupId>org.springframework.boot</groupId>

Also available in: Unified diff