/ - Diff - D-Net - D-Net project tracking tool

     		<version>1.0.0</version>
     	</parent>
     	<artifactId>uoa-authorization-library</artifactId>
     	<version>2.0.4-SNAPSHOT</version>
     	<version>2.1.0-SNAPSHOT</version>
     	<packaging>jar</packaging>
     	<scm>
     		<developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/uoa-authorization-library/trunk</developerConnection>

     public class SecurityConfig {
         private String userInfoUrl;
         private String session;
         public String getUserInfoUrl() {
             return userInfoUrl;
-...
             this.userInfoUrl = userInfoUrl;
+        }
         /** @deprecated */
         public boolean isDeprecated() {
             return userInfoUrl.contains("accessToken");
         public String getSession() {
             return session;
+        }
         public void setSession(String session) {
             this.session = session;
+        }
+    }

modules/uoa-authorization-library/trunk/src/main/java/eu/dnetlib/uoaauthorizationlibrary/controllers/AuthorizationLibraryCheckDeployController.java
36	36	public Map<String, String> checkEverything() {
37	37	Map<String, String> response = new HashMap<>();
38	38	response.put("authorization.security.userInfoUrl", securityConfig.getUserInfoUrl());
	39	response.put("authorization.security.session", securityConfig.getSession());
39	40	if(GlobalVars.date != null) {
40	41	response.put("Date of deploy", GlobalVars.date.toString());
41	42	}

     public class AuthorizationUtils {
         private final Logger log = Logger.getLogger(this.getClass());
         private final SecurityConfig securityConfig;
         private final static String TOKEN = "AccessToken";
         private final static String SESSION = "OpenAIRESession";
         @Autowired
         AuthorizationUtils(SecurityConfig securityConfig) {
             this.securityConfig = securityConfig;
+        }
         private String getToken(HttpServletRequest request) {
             if (request.getCookies() == null) {
                 return null;
+            }
             for (Cookie c : request.getCookies()) {
                 if (c.getName().equals(TOKEN)) {
                     return c.getValue();
+                }
+            }
             return null;
+        }
         public UserInfo getUserInfo(HttpServletRequest request) {
             String url = securityConfig.getUserInfoUrl() + (securityConfig.isDeprecated()?getToken(request):"");
             String url = securityConfig.getUserInfoUrl();
             RestTemplate restTemplate = new RestTemplate();
             try {
                 if(hasCookie(request)) {
                     ResponseEntity<UserInfo> response = restTemplate.exchange(url, HttpMethod.GET, createHeaders(request), UserInfo.class);
                     return  response.getBody();
                     return response.getBody();
+                }
                 return null;
             } catch (RestClientException e) {
                 log.error(url + ":" + e.getMessage());
                 log.error(url + ": " + e.getMessage());
                 return null;
+            }
+        }
-...
         private boolean hasCookie(HttpServletRequest request) {
             Cookie[] cookies = request.getCookies();
             if(cookies != null) {
                 if (securityConfig.isDeprecated()) {
                     return Arrays.stream(cookies).anyMatch(cookie -> cookie.getName().equalsIgnoreCase(TOKEN));
                 } else {
                     return Arrays.stream(cookies).anyMatch(cookie -> cookie.getName().equalsIgnoreCase(SESSION));
+                }
                 return Arrays.stream(cookies).anyMatch(cookie -> cookie.getName().equalsIgnoreCase(this.securityConfig.getSession()));
+            }
             return false;
+        }

modules/uoa-authorization-library/trunk/src/main/resources/authorization.properties
1	1	#dev
2	2	authorization.security.userInfoUrl = http://mpagasas.di.uoa.gr:8080/login-service/userInfo
	3	authorization.security.session=openAIRESession
3	4	authorization.globalVars.buildDate=@timestampAuthorizationLibrary@
4	5	authorization.globalVars.version=@project.version@

Project

General

Profile

D-Net

Revision 61809

Added by Konstantinos Triantafyllou almost 3 years ago