Project

General

Profile

« Previous | Next » 

Revision 50948

add better logs

View differences:

modules/uoa-claims-api/trunk/src/main/java/eu/dnetlib/openaire/rest/Authorization.java
53 53
        return isRegistered(userInfo);
54 54

  
55 55
    }
56
    public void logStatus(String token, String cookie) {
56 57

  
58
        if(token == null || token.isEmpty()) {
59
            logger.debug("No proper value: header \"X-XSRF-TOKEN\" has value " + token);
60
        }else if(cookie == null || cookie.isEmpty() || !cookie.equals(token)) {
61
            logger.debug("No proper value: cookie  \"AccessToken\" has value  " + cookie);
62
        }else if( !cookie.equals(token)) {
63
            logger.debug("No proper values:for cookie " + cookie + " and token "+token);
64
        }
65
    }
66

  
57 67
    public boolean isRegistered(UserInfo userInfo) {
58 68
        if (userInfo != null && userInfo.getEdu_person_entitlements() != null) {
59 69

  
modules/uoa-claims-api/trunk/src/main/java/eu/dnetlib/openaire/rest/HelloWorldService.java
67 67
                                     @HeaderParam("X-XSRF-TOKEN") String token,
68 68
                                     @CookieParam("AccessToken") String  cookie,
69 69
                           @Context HttpServletRequest request) {
70
        logger.debug("header \"X-XSRF-TOKEN\" has value " + token);
71
        logger.debug("cookie  \"AccessToken\" has value  " + cookie);
72 70

  
73 71
        if(token == null || token.isEmpty() || cookie == null || cookie.isEmpty() || !cookie.equals(token)){
72
            authorization.logStatus(token,cookie);
74 73
            return Response.status(Response.Status.FORBIDDEN).entity(compose403Message("Forbidden: You don't have permission to access. Maybe you are not registered."))
75 74
                    .type(MediaType.APPLICATION_JSON)
76 75
                    .build();
......
125 124
                                     @HeaderParam("X-XSRF-TOKEN") String token,
126 125
                                     @CookieParam("AccessToken") String  cookie,
127 126
                                     @Context HttpServletRequest request) {
128
        logger.debug("header \"X-XSRF-TOKEN\" has value " + token);
129
        logger.debug("cookie  \"AccessToken\" has value  " + cookie);
127
         
130 128

  
131 129
        if(token == null || token.isEmpty() || cookie == null || cookie.isEmpty() || !cookie.equals(token)){
130
            authorization.logStatus(token,cookie);
132 131
            return Response.status(Response.Status.FORBIDDEN).entity(compose403Message("Forbidden: You don't have permission to access. Maybe you are not registered."))
133 132
                    .type(MediaType.APPLICATION_JSON)
134 133
                    .build();
......
195 194
                                     @HeaderParam("X-XSRF-TOKEN") String token,
196 195
                                     @CookieParam("AccessToken") String  cookie,
197 196
                                     @Context HttpServletRequest request) {
198
        logger.debug("header \"X-XSRF-TOKEN\" has value " + token);
199
        logger.debug("cookie  \"AccessToken\" has value  " + cookie);
197
         
200 198

  
201 199
        if(token == null || token.isEmpty() || cookie == null || cookie.isEmpty() || !cookie.equals(token)){
200
            authorization.logStatus(token,cookie);
202 201
            return Response.status(Response.Status.FORBIDDEN).entity(compose403Message("Forbidden: You don't have permission to access. Maybe you are not registered."))
203 202
                    .type(MediaType.APPLICATION_JSON)
204 203
                    .build();
......
253 252
                                    @HeaderParam("X-XSRF-TOKEN") String token,
254 253
                                    @CookieParam("AccessToken") String  cookie,
255 254
                                    @Context HttpServletRequest request) {
256
        logger.debug("header \"X-XSRF-TOKEN\" has value " + token);
257
        logger.debug("cookie  \"AccessToken\" has value  " + cookie);
255
         
258 256

  
259 257
        if(token == null || token.isEmpty() || cookie == null || cookie.isEmpty() || !cookie.equals(token)){
258
            authorization.logStatus(token,cookie);
260 259
            return Response.status(Response.Status.FORBIDDEN).entity(compose403Message("Forbidden: You don't have permission to access. Maybe you are not registered."))
261 260
                    .type(MediaType.APPLICATION_JSON)
262 261
                    .build();
......
310 309
                                  @HeaderParam("X-XSRF-TOKEN") String token,
311 310
                                  @CookieParam("AccessToken") String  cookie,
312 311
                                  @Context HttpServletRequest request) {
313
        logger.debug("header \"X-XSRF-TOKEN\" has value " + token);
314
        logger.debug("cookie  \"AccessToken\" has value  " + cookie);
312
         
315 313

  
316 314
        if(token == null || token.isEmpty() || cookie == null || cookie.isEmpty() || !cookie.equals(token)){
317 315
            return Response.status(Response.Status.FORBIDDEN).entity(compose403Message("Forbidden: You don't have permission to access. Maybe you are not registered."))
......
372 370
                                  @HeaderParam("X-XSRF-TOKEN") String token,
373 371
                                  @CookieParam("AccessToken") String  cookie,
374 372
                                  @Context HttpServletRequest request) {
375
        logger.debug("header \"X-XSRF-TOKEN\" has value " + token);
376
        logger.debug("cookie  \"AccessToken\" has value  " + cookie);
373
         
377 374

  
378 375
        if(token == null || token.isEmpty() || cookie == null || cookie.isEmpty() || !cookie.equals(token)){
379 376
            return Response.status(Response.Status.FORBIDDEN).entity(compose403Message("Forbidden: You don't have permission to access. Maybe you are not registered."))
......
433 430
                                 @CookieParam("AccessToken") String  cookie,
434 431
                                  @Context HttpServletRequest request) {
435 432

  
436
        logger.debug("header \"X-XSRF-TOKEN\" has value " + token);
437
        logger.debug("cookie  \"AccessToken\" has value  " + cookie);
433
         
438 434
        logger.debug("Header  \"Origin\" has value  " + origin);
439 435
   
440 436

  
......
564 560
                                     @HeaderParam("Origin") String origin,
565 561
                                     @CookieParam("AccessToken") String  cookie){
566 562

  
567
        logger.debug("header \"X-XSRF-TOKEN\" has value " + token);
568
        logger.debug("cookie  \"AccessToken\" has value  " + cookie);
563
         
569 564

  
570 565
         if(token == null || token.isEmpty() || cookie == null || cookie.isEmpty() || !cookie.equals(token)|| !authorization.hasValidOrigin(origin)){
571 566
             return Response.status(Response.Status.FORBIDDEN).entity(compose403Message("Forbidden: You don't have permission to access. Maybe you are not registered."))
......
628 623
                             @HeaderParam("X-XSRF-TOKEN") String token,
629 624
                             @HeaderParam("Origin") String origin,
630 625
                             @CookieParam("AccessToken") String  cookie) {
631
        logger.debug("header \"X-XSRF-TOKEN\" has value " + token);
632
        logger.debug("cookie  \"AccessToken\" has value  " + cookie);
626
         
633 627

  
634 628
        if(token == null || token.isEmpty() || cookie == null || cookie.isEmpty() || !cookie.equals(token) || !authorization.hasValidOrigin(origin)){
635 629
            return Response.status(Response.Status.FORBIDDEN).entity(compose403Message("Forbidden: You don't have permission to access. Maybe you are not registered."))
......
702 696
                                  @HeaderParam("X-XSRF-TOKEN") String token,
703 697
                                  @HeaderParam("Origin") String origin,
704 698
                                  @CookieParam("AccessToken") String  cookie) {
705
        logger.debug("header \"X-XSRF-TOKEN\" has value " + token);
706
        logger.debug("cookie  \"AccessToken\" has value  " + cookie);
699
         
707 700

  
708 701
        if(token == null || token.isEmpty() || cookie == null || cookie.isEmpty() || !cookie.equals(token)|| !authorization.hasValidOrigin(origin)){
709 702
            return Response.status(Response.Status.FORBIDDEN).entity(compose403Message("Forbidden: You don't have permission to access. Maybe you are not registered."))
......
807 800
                                     @HeaderParam("X-XSRF-TOKEN") String token,
808 801
                                     @HeaderParam("Origin") String origin,
809 802
                                     @CookieParam("AccessToken") String  cookie) {
810
        logger.debug("header \"X-XSRF-TOKEN\" has value " + token);
811
        logger.debug("cookie  \"AccessToken\" has value  " + cookie);
803
         
812 804

  
813 805
        if(token == null || token.isEmpty() || cookie == null || cookie.isEmpty() || !cookie.equals(token)|| !authorization.hasValidOrigin(origin)){
814 806
            return Response.status(Response.Status.FORBIDDEN).entity(compose403Message("Forbidden: You don't have permission to access. Maybe you are not registered."))
......
876 868
                                    @HeaderParam("X-XSRF-TOKEN") String token,
877 869
                                    @HeaderParam("Origin") String origin,
878 870
                                    @CookieParam("AccessToken") String  cookie) {
879
        logger.debug("header \"X-XSRF-TOKEN\" has value " + token);
880
        logger.debug("cookie  \"AccessToken\" has value  " + cookie);
881 871

  
872

  
882 873
        if(token == null || token.isEmpty() || cookie == null || cookie.isEmpty() || !cookie.equals(token)|| !authorization.hasValidOrigin(origin)){
874
             
883 875
            return Response.status(Response.Status.FORBIDDEN).entity(compose403Message("Forbidden: You don't have permission to access. Maybe you are not registered."))
884 876
                    .type(MediaType.APPLICATION_JSON)
885 877
                    .build();
......
926 918
    @Produces(MediaType.APPLICATION_JSON)
927 919
    public Response fetchCommunities(@HeaderParam("X-XSRF-TOKEN") String token,
928 920
                                     @CookieParam("AccessToken") String  cookie) throws ISLookUpServiceException {
929
        logger.debug("header \"X-XSRF-TOKEN\" has value " + token);
930
        logger.debug("cookie  \"AccessToken\" has value  " + cookie);
921
         
931 922

  
932 923
        if(token == null || token.isEmpty() || cookie == null || cookie.isEmpty() || !cookie.equals(token)){
933 924
            return Response.status(Response.Status.FORBIDDEN).entity(compose403Message("Forbidden: You don't have permission to access. Maybe you are not registered."))
......
955 946
    public Response fetchCommunityCategories(@PathParam("communityid") String communityid,
956 947
                                             @HeaderParam("X-XSRF-TOKEN") String token,
957 948
                                             @CookieParam("AccessToken") String  cookie) throws ISLookUpServiceException {
958
        logger.debug("header \"X-XSRF-TOKEN\" has value " + token);
959
        logger.debug("cookie  \"AccessToken\" has value  " + cookie);
949
         
960 950

  
961 951
        if(token == null || token.isEmpty() || cookie == null || cookie.isEmpty() || !cookie.equals(token)){
962 952
            return Response.status(Response.Status.FORBIDDEN).entity(compose403Message("Forbidden: You don't have permission to access. Maybe you are not registered."))
......
991 981
    public Response fetchCategoryConcepts(@PathParam("categoryid") String categoryid,
992 982
                                          @HeaderParam("X-XSRF-TOKEN") String token,
993 983
                                          @CookieParam("AccessToken") String  cookie) throws ISLookUpServiceException {
994
        logger.debug("header \"X-XSRF-TOKEN\" has value " + token);
995
        logger.debug("cookie  \"AccessToken\" has value  " + cookie);
984
         
996 985

  
997 986
        if(token == null || token.isEmpty() || cookie == null || cookie.isEmpty() || !cookie.equals(token)){
998 987
            return Response.status(Response.Status.FORBIDDEN).entity(compose403Message("Forbidden: You don't have permission to access. Maybe you are not registered."))
modules/uoa-claims-api/trunk/src/main/java/eu/dnetlib/openaire/rest/inputHandler/UserHandler.java
87 87

  
88 88
            for (int i = 0; i < userInfo.getEdu_person_entitlements().size(); i++) {
89 89
                String role = userInfo.getEdu_person_entitlements().get(i);
90
                logger.debug("AAI role: "+role);
90 91
                role = role.split(":")[role.split(":").length-1];
91 92
                role = role.replace("+"," ");
92 93
                logger.debug("Adding parsed role : "+role);
modules/uoa-claims-api/trunk/src/main/resources/eu/dnetlib/openaire/rest/springContext-claims-authorization.properties
3 3
services.claims.authorization.originServer = http://scoobydoo.di.uoa.gr:5000
4 4
services.claims.authorization.registeredRoles = OpenAIRE Super Administrator,OpenAIRE Portal Administrator,OpenAIRE Expert - Community,OpenAIRE Expert - Funder,OpenAIRE Curator - Claim,OpenAIRE Curator - Project,OpenAIRE Curator - Community,OpenAIRE Curator - Institution,OpenAIRE Author,Registered User,User Manager
5 5
services.claims.authorization.adminRoles = OpenAIRE Super Administrator,OpenAIRE Curator - Claim,OpenAIRE Portal Administrator
6
services.claims.authorization.projectCuratorRoles = OpenAIRE Curator - Project
6
services.claims.authorization.projectCuratorRoles = OpenAIRE Curator - Project,OpenAIRE Super Administrator,OpenAIRE Curator - Claim,OpenAIRE Portal Administrator

Also available in: Unified diff