X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-service%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fservice%2Fapi%2FAPI_Roles.java;h=6088dd3670e4937af2f26da59ecd2dd6f1dc18d1;hb=1aba148a7ff88c8f43762da19fa4c757c62732c5;hp=24259e16291619bf851035ae77ab153c95740f49;hpb=ceda6e8bc270202bcb24340b86617110289c902e;p=aaf%2Fauthz.git

diff --git a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/api/API_Roles.java b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/api/API_Roles.java
index 24259e16..6088dd36 100644
--- a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/api/API_Roles.java
+++ b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/api/API_Roles.java
@@ -27,6 +27,8 @@ import static org.onap.aaf.auth.rserv.HttpMethods.GET;
 import static org.onap.aaf.auth.rserv.HttpMethods.POST;
 import static org.onap.aaf.auth.rserv.HttpMethods.PUT;
 
+import java.net.URLDecoder;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -38,300 +40,301 @@ import org.onap.aaf.auth.service.AAF_Service;
 import org.onap.aaf.auth.service.Code;
 import org.onap.aaf.auth.service.facade.AuthzFacade;
 import org.onap.aaf.auth.service.mapper.Mapper.API;
+import org.onap.aaf.cadi.config.Config;
 
 public class API_Roles {
-	public static void init(AAF_Service authzAPI, AuthzFacade facade) throws Exception {
-		/**
-		 * puts a new role in Authz DB
-		 */
-		authzAPI.route(POST,"/authz/role",API.ROLE_REQ, new Code(facade,"Create Role",true) {
-					@Override
-					public void handle(
-							AuthzTrans trans,
-							HttpServletRequest req, 
-							HttpServletResponse resp) throws Exception {
-						Result<Void> r = context.createRole(trans, req, resp);
-							
-						switch(r.status) {
-							case OK:
-								resp.setStatus(HttpStatus.CREATED_201); 
-								break;
-							case Status.ACC_Future:
-								resp.setStatus(HttpStatus.ACCEPTED_202); 
-								break;
-							default:
-								context.error(trans,resp,r);
-						}
-					}
-				}
-			);
+    public static void init(AAF_Service authzAPI, AuthzFacade facade) throws Exception {
+        /**
+         * puts a new role in Authz DB
+         */
+        authzAPI.route(POST,"/authz/role",API.ROLE_REQ, new Code(facade,"Create Role",true) {
+                    @Override
+                    public void handle(
+                            AuthzTrans trans,
+                            HttpServletRequest req, 
+                            HttpServletResponse resp) throws Exception {
+                        Result<Void> r = context.createRole(trans, req, resp);
+                            
+                        switch(r.status) {
+                            case OK:
+                                resp.setStatus(HttpStatus.CREATED_201); 
+                                break;
+                            case Status.ACC_Future:
+                                resp.setStatus(HttpStatus.ACCEPTED_202); 
+                                break;
+                            default:
+                                context.error(trans,resp,r);
+                        }
+                    }
+                }
+            );
 
-		/** 
-		 *  get Role by name
-		 */
-		authzAPI.route(GET, "/authz/roles/:role", API.ROLES, new Code(facade,"GetRolesByFullName",true) {
-			public void handle(
-					AuthzTrans trans, 
-					HttpServletRequest req,
-					HttpServletResponse resp) throws Exception {
-				
-				Result<Void> r = context.getRolesByName(trans, resp, pathParam(req, "role"));
-				switch(r.status) {
-					case OK: 
-						resp.setStatus(HttpStatus.OK_200); 
-						break;
-					default:
-						context.error(trans,resp,r);
-				}
-			}
+        /** 
+         *  get Role by name
+         */
+        authzAPI.route(GET, "/authz/roles/:role", API.ROLES, new Code(facade,"GetRolesByFullName",true) {
+            public void handle(
+                    AuthzTrans trans, 
+                    HttpServletRequest req,
+                    HttpServletResponse resp) throws Exception {
+                
+                Result<Void> r = context.getRolesByName(trans, resp, pathParam(req, "role"));
+                switch(r.status) {
+                    case OK: 
+                        resp.setStatus(HttpStatus.OK_200); 
+                        break;
+                    default:
+                        context.error(trans,resp,r);
+                }
+            }
 
-		});
+        });
 
 
-		/** 
-		 *  gets all Roles by user name
-		 */
-		authzAPI.route(GET, "/authz/roles/user/:name", API.ROLES, new Code(facade,"GetRolesByUser",true) {
-			public void handle(
-					AuthzTrans trans, 
-					HttpServletRequest req,
-					HttpServletResponse resp) throws Exception {
-				
-				Result<Void> r = context.getRolesByUser(trans, resp, pathParam(req, "name"));
-				switch(r.status) {
-					case OK: 
-						resp.setStatus(HttpStatus.OK_200); 
-						break;
-					default:
-						context.error(trans,resp,r);
-				}
-			}
+        /** 
+         *  gets all Roles by user name
+         */
+        authzAPI.route(GET, "/authz/roles/user/:name", API.ROLES, new Code(facade,"GetRolesByUser",true) {
+            public void handle(
+                    AuthzTrans trans, 
+                    HttpServletRequest req,
+                    HttpServletResponse resp) throws Exception {
+                
+                Result<Void> r = context.getRolesByUser(trans, resp, pathParam(req, "name"));
+                switch(r.status) {
+                    case OK: 
+                        resp.setStatus(HttpStatus.OK_200); 
+                        break;
+                    default:
+                        context.error(trans,resp,r);
+                }
+            }
 
-		});
+        });
 
-		/** 
-		 *  gets all Roles by Namespace
-		 */
-		authzAPI.route(GET, "/authz/roles/ns/:ns", API.ROLES, new Code(facade,"GetRolesByNS",true) {
-			public void handle(
-					AuthzTrans trans, 
-					HttpServletRequest req,
-					HttpServletResponse resp) throws Exception {
-				
-				Result<Void> r = context.getRolesByNS(trans, resp, pathParam(req, "ns"));
-				switch(r.status) {
-					case OK: 
-						resp.setStatus(HttpStatus.OK_200); 
-						break;
-					default:
-						context.error(trans,resp,r);
-				}
-			}
-		});
+        /** 
+         *  gets all Roles by Namespace
+         */
+        authzAPI.route(GET, "/authz/roles/ns/:ns", API.ROLES, new Code(facade,"GetRolesByNS",true) {
+            public void handle(
+                    AuthzTrans trans, 
+                    HttpServletRequest req,
+                    HttpServletResponse resp) throws Exception {
+                
+                Result<Void> r = context.getRolesByNS(trans, resp, pathParam(req, "ns"));
+                switch(r.status) {
+                    case OK: 
+                        resp.setStatus(HttpStatus.OK_200); 
+                        break;
+                    default:
+                        context.error(trans,resp,r);
+                }
+            }
+        });
 
-		/** 
-		 *  gets all Roles by Name without the Namespace
-		 */
-		authzAPI.route(GET, "/authz/roles/name/:name", API.ROLES, new Code(facade,"GetRolesByNameOnly",true) {
-			public void handle(
-					AuthzTrans trans, 
-					HttpServletRequest req,
-					HttpServletResponse resp) throws Exception {
-				Result<Void> r = context.getRolesByNameOnly(trans, resp, pathParam(req, ":name"));
-				switch(r.status) {
-					case OK: 
-						resp.setStatus(HttpStatus.OK_200); 
-						break;
-					default:
-						context.error(trans,resp,r);
-				}
-			}
-		});
-		
-		/**
-		 * Deletes a Role from Authz DB by Object
-		 */
-		authzAPI.route(DELETE,"/authz/role",API.ROLE_REQ, new Code(facade,"Delete Role",true) {
-				@Override
-				public void handle(
-						AuthzTrans trans,
-						HttpServletRequest req, 
-						HttpServletResponse resp) throws Exception {
-					Result<Void> r = context.deleteRole(trans, req, resp);
-					
-					switch(r.status) {
-						case OK:
-							resp.setStatus(HttpStatus.OK_200); 
-							break;
-						default:
-							context.error(trans,resp,r);
-					}
-				}
-			
-			}
-		);
-	
+        /** 
+         *  gets all Roles by Name without the Namespace
+         */
+        authzAPI.route(GET, "/authz/roles/name/:name", API.ROLES, new Code(facade,"GetRolesByNameOnly",true) {
+            public void handle(
+                    AuthzTrans trans, 
+                    HttpServletRequest req,
+                    HttpServletResponse resp) throws Exception {
+                Result<Void> r = context.getRolesByNameOnly(trans, resp, pathParam(req, ":name"));
+                switch(r.status) {
+                    case OK: 
+                        resp.setStatus(HttpStatus.OK_200); 
+                        break;
+                    default:
+                        context.error(trans,resp,r);
+                }
+            }
+        });
+        
+        /**
+         * Deletes a Role from Authz DB by Object
+         */
+        authzAPI.route(DELETE,"/authz/role",API.ROLE_REQ, new Code(facade,"Delete Role",true) {
+                @Override
+                public void handle(
+                        AuthzTrans trans,
+                        HttpServletRequest req, 
+                        HttpServletResponse resp) throws Exception {
+                    Result<Void> r = context.deleteRole(trans, req, resp);
+                    
+                    switch(r.status) {
+                        case OK:
+                            resp.setStatus(HttpStatus.OK_200); 
+                            break;
+                        default:
+                            context.error(trans,resp,r);
+                    }
+                }
+            
+            }
+        );
+    
 
-		
-		/**
-		 * Deletes a Role from Authz DB by Key
-		 */
-		authzAPI.route(DELETE,"/authz/role/:role",API.ROLE, new Code(facade,"Delete Role",true) {
-				@Override
-				public void handle(
-						AuthzTrans trans,
-						HttpServletRequest req, 
-						HttpServletResponse resp) throws Exception {
-					Result<Void> r = context.deleteRole(trans, resp, pathParam(req,":role"));
-						
-					switch(r.status) {
-						case OK:
-							resp.setStatus(HttpStatus.OK_200); 
-							break;
-						default:
-							context.error(trans,resp,r);
-					}
-				}
-			
-			}
-		);
-	
+        
+        /**
+         * Deletes a Role from Authz DB by Key
+         */
+        authzAPI.route(DELETE,"/authz/role/:role",API.ROLE, new Code(facade,"Delete Role",true) {
+                @Override
+                public void handle(
+                        AuthzTrans trans,
+                        HttpServletRequest req, 
+                        HttpServletResponse resp) throws Exception {
+                    Result<Void> r = context.deleteRole(trans, resp, pathParam(req,":role"));
+                        
+                    switch(r.status) {
+                        case OK:
+                            resp.setStatus(HttpStatus.OK_200); 
+                            break;
+                        default:
+                            context.error(trans,resp,r);
+                    }
+                }
+            
+            }
+        );
+    
 
-		/**
-		 * Add a Permission to a Role (Grant)
-		 */
-		authzAPI.route(POST,"/authz/role/perm",API.ROLE_PERM_REQ, new Code(facade,"Add Permission to Role",true) {
-				@Override
-				public void handle(
-						AuthzTrans trans,
-						HttpServletRequest req, 
-						HttpServletResponse resp) throws Exception {
-					
-					Result<Void> r = context.addPermToRole(trans, req, resp);
-						
-					switch(r.status) {
-						case OK:
-							resp.setStatus(HttpStatus.CREATED_201); 
-							break;
-						default:
-							context.error(trans,resp,r);
-					}
-				}
-			}
-		);
-		
-		/**
-		 * Get all Roles by Permission
-		 */
-		authzAPI.route(GET,"/authz/roles/perm/:type/:instance/:action",API.ROLES,new Code(facade,"GetRolesByPerm",true) {
-			public void handle(
-					AuthzTrans trans, 
-					HttpServletRequest req,
-					HttpServletResponse resp) throws Exception {
-				
-				Result<Void> r = context.getRolesByPerm(trans, resp, 
-						pathParam(req, "type"),
-						pathParam(req, "instance"),
-						pathParam(req, "action"));
-				switch(r.status) {
-					case OK: 
-						resp.setStatus(HttpStatus.OK_200); 
-						break;
-					default:
-						context.error(trans,resp,r);
-				}
-			}
-		});
-		
-		/**
-		 * Set a role's description
-		 */
-		authzAPI.route(PUT,"/authz/role",API.ROLE_REQ,new Code(facade,"Set Description for role",true) {
-			@Override
-			public void handle(
-					AuthzTrans trans, 
-					HttpServletRequest req,
-					HttpServletResponse resp) throws Exception {
-				
-				Result<Void> r = context.updateRoleDescription(trans, req, resp);
-				switch(r.status) {
-					case OK: 
-						resp.setStatus(HttpStatus.OK_200); 
-						break;
-					default:
-						context.error(trans,resp,r);
-				}
-			}
-		});	
-		
-		/**
-		 * Set a permission's roles to roles given
-		 */
-		authzAPI.route(PUT,"/authz/role/perm",API.ROLE_PERM_REQ,new Code(facade,"Set a Permission's Roles",true) {
-			@Override
-			public void handle(
-					AuthzTrans trans, 
-					HttpServletRequest req,
-					HttpServletResponse resp) throws Exception {
-				
-				Result<Void> r = context.resetPermRoles(trans, req, resp);
-				switch(r.status) {
-					case OK: 
-						resp.setStatus(HttpStatus.OK_200); 
-						break;
-					default:
-						context.error(trans,resp,r);
-				}
-			}
-		});	
-		
-		/**
-		 * Delete a Permission from a Role
-		 * With multiple perms
-		 */
-		authzAPI.route(DELETE,"/authz/role/:role/perm",API.ROLE_PERM_REQ, new Code(facade,"Delete Permission from Role",true) {
-			@Override
-			public void handle(
-					AuthzTrans trans,
-					HttpServletRequest req, 
-					HttpServletResponse resp) throws Exception {
-				Result<Void> r = context.delPermFromRole(trans, req, resp);
-					
-				switch(r.status) {
-					case OK:
-						resp.setStatus(HttpStatus.OK_200); 
-						break;
-					default:
-						context.error(trans,resp,r);
-				}
-			}
-		});
+        /**
+         * Add a Permission to a Role (Grant)
+         */
+        authzAPI.route(POST,"/authz/role/perm",API.ROLE_PERM_REQ, new Code(facade,"Add Permission to Role",true) {
+                @Override
+                public void handle(
+                        AuthzTrans trans,
+                        HttpServletRequest req, 
+                        HttpServletResponse resp) throws Exception {
+                    
+                    Result<Void> r = context.addPermToRole(trans, req, resp);
+                        
+                    switch(r.status) {
+                        case OK:
+                            resp.setStatus(HttpStatus.CREATED_201); 
+                            break;
+                        default:
+                            context.error(trans,resp,r);
+                    }
+                }
+            }
+        );
+        
+        /**
+         * Get all Roles by Permission
+         */
+        authzAPI.route(GET,"/authz/roles/perm/:type/:instance/:action",API.ROLES,new Code(facade,"GetRolesByPerm",true) {
+            public void handle(
+                    AuthzTrans trans, 
+                    HttpServletRequest req,
+                    HttpServletResponse resp) throws Exception {
+                
+                Result<Void> r = context.getRolesByPerm(trans, resp, 
+                        pathParam(req, "type"),
+                        URLDecoder.decode(pathParam(req, "instance"),Config.UTF_8),
+                        pathParam(req, "action"));
+                switch(r.status) {
+                    case OK: 
+                        resp.setStatus(HttpStatus.OK_200); 
+                        break;
+                    default:
+                        context.error(trans,resp,r);
+                }
+            }
+        });
+        
+        /**
+         * Set a role's description
+         */
+        authzAPI.route(PUT,"/authz/role",API.ROLE_REQ,new Code(facade,"Set Description for role",true) {
+            @Override
+            public void handle(
+                    AuthzTrans trans, 
+                    HttpServletRequest req,
+                    HttpServletResponse resp) throws Exception {
+                
+                Result<Void> r = context.updateRoleDescription(trans, req, resp);
+                switch(r.status) {
+                    case OK: 
+                        resp.setStatus(HttpStatus.OK_200); 
+                        break;
+                    default:
+                        context.error(trans,resp,r);
+                }
+            }
+        });    
+        
+        /**
+         * Set a permission's roles to roles given
+         */
+        authzAPI.route(PUT,"/authz/role/perm",API.ROLE_PERM_REQ,new Code(facade,"Set a Permission's Roles",true) {
+            @Override
+            public void handle(
+                    AuthzTrans trans, 
+                    HttpServletRequest req,
+                    HttpServletResponse resp) throws Exception {
+                
+                Result<Void> r = context.resetPermRoles(trans, req, resp);
+                switch(r.status) {
+                    case OK: 
+                        resp.setStatus(HttpStatus.OK_200); 
+                        break;
+                    default:
+                        context.error(trans,resp,r);
+                }
+            }
+        });    
+        
+        /**
+         * Delete a Permission from a Role
+         * With multiple perms
+         */
+        authzAPI.route(DELETE,"/authz/role/:role/perm",API.ROLE_PERM_REQ, new Code(facade,"Delete Permission from Role",true) {
+            @Override
+            public void handle(
+                    AuthzTrans trans,
+                    HttpServletRequest req, 
+                    HttpServletResponse resp) throws Exception {
+                Result<Void> r = context.delPermFromRole(trans, req, resp);
+                    
+                switch(r.status) {
+                    case OK:
+                        resp.setStatus(HttpStatus.OK_200); 
+                        break;
+                    default:
+                        context.error(trans,resp,r);
+                }
+            }
+        });
 
 
-		/*
-		 * Delete a Permission from a Role by key only
-		 * /
-		authzAPI.route(DELETE,"/authz/role/:role/perm/:type/:instance/:action",API.ROLE_PERM_REQ, new Code(facade,"Delete Permission from Role",true) {
-			@Override
-			public void handle(
-					AuthzTrans trans,
-					HttpServletRequest req, 
-					HttpServletResponse resp) throws Exception {
-				Result<Void> r = context.delPermFromRole(trans, resp, 
-						pathParam(req,":role"),
-						pathParam(req,":type"),
-						pathParam(req,":instance"),
-						pathParam(req,":action"));
-					
-				switch(r.status) {
-					case OK:
-						resp.setStatus(HttpStatus.OK_200); 
-						break;
-					default:
-						context.error(trans,resp,r);
-				}
-			}
-		});
-		*/
-	}
+        /*
+         * Delete a Permission from a Role by key only
+         * /
+        authzAPI.route(DELETE,"/authz/role/:role/perm/:type/:instance/:action",API.ROLE_PERM_REQ, new Code(facade,"Delete Permission from Role",true) {
+            @Override
+            public void handle(
+                    AuthzTrans trans,
+                    HttpServletRequest req, 
+                    HttpServletResponse resp) throws Exception {
+                Result<Void> r = context.delPermFromRole(trans, resp, 
+                        pathParam(req,":role"),
+                        pathParam(req,":type"),
+                        pathParam(req,":instance"),
+                        pathParam(req,":action"));
+                    
+                switch(r.status) {
+                    case OK:
+                        resp.setStatus(HttpStatus.OK_200); 
+                        break;
+                    default:
+                        context.error(trans,resp,r);
+                }
+            }
+        });
+        */
+    }
 }