From 8d5386be38db25a2a41c3bf6c876adee21ca26cc Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Fri, 19 Sep 2014 08:26:02 +0000
Subject: [PATCH] #396 fix - Fixed more SonarQube issues
---
securis/src/main/java/net/curisit/securis/services/BasicServices.java | 149 ++++++++++++++++++++++++-------------------------
1 files changed, 73 insertions(+), 76 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/BasicServices.java b/securis/src/main/java/net/curisit/securis/services/BasicServices.java
index 6e639cc..6844d2d 100644
--- a/securis/src/main/java/net/curisit/securis/services/BasicServices.java
+++ b/securis/src/main/java/net/curisit/securis/services/BasicServices.java
@@ -36,90 +36,87 @@
@Singleton
public class BasicServices {
- private static final Logger LOG = LogManager.getLogger(BasicServices.class);
+ private static final Logger LOG = LogManager.getLogger(BasicServices.class);
- @Inject
- TokenHelper tokenHelper;
+ @Inject
+ TokenHelper tokenHelper;
- @Inject
- public BasicServices() {
- }
+ @Inject
+ public BasicServices() {}
- @GET
- @Path("/info")
- @Produces(
- { MediaType.TEXT_PLAIN })
- public Response info(@Context HttpServletRequest request) {
- return Response.ok().entity("License server running OK. Date: " + new Date()).build();
- }
+ @GET
+ @Path("/info")
+ @Produces({ MediaType.TEXT_PLAIN })
+ public Response info(@Context HttpServletRequest request) {
+ return Response.ok().entity("License server running OK. Date: " + new Date()).build();
+ }
- @GET
- @Path("/{module:(admin)|(login)|(licenses)}")
- @Produces(
- { MediaType.TEXT_HTML })
- public Response init(@PathParam("module") String module, @Context HttpServletRequest request) {
- LOG.info("App index main.html");
- String page = "/main.html";
- URI uri = UriBuilder.fromUri(page).build();
- return Response.seeOther(uri).build();
- }
+ @GET
+ @Path("/{module:(admin)|(login)|(licenses)}")
+ @Produces({ MediaType.TEXT_HTML })
+ public Response init(@PathParam("module") String module, @Context HttpServletRequest request) {
+ LOG.info("App index main.html");
+ String page = "/main.html";
+ URI uri = UriBuilder.fromUri(page).build();
+ return Response.seeOther(uri).build();
+ }
- @POST
- @Path("/login")
- @Produces(
- { MediaType.APPLICATION_JSON })
- public Response login(@FormParam("username") String user, @FormParam("password") String password, @Context HttpServletRequest request) {
- LOG.info("index session: " + request.getSession());
- LOG.info("user: {}, pass: {}", user, password);
- LOG.info("is user in role: {} == {} ? ", "advance", request.isUserInRole("advance"));
+ @POST
+ @Path("/login")
+ @Produces({ MediaType.APPLICATION_JSON })
+ public Response login(@FormParam("username") String user, @FormParam("password") String password, @Context HttpServletRequest request) {
+ LOG.info("index session: " + request.getSession());
+ LOG.info("user: {}, pass: {}", user, password);
+ LOG.info("is user in role: {} == {} ? ", "advance", request.isUserInRole("advance"));
- if ("no".equals(password))
- return Response.status(Status.UNAUTHORIZED).build();
- String tokenAuth = tokenHelper.generateToken(user);
- return Response.ok(Utils.createMap("success", true, "token", tokenAuth)).build();
- }
+ if ("no".equals(password)) {
+ // TODO: Code to text exception handling
+ return Response.status(Status.UNAUTHORIZED).build();
+ }
+ String tokenAuth = tokenHelper.generateToken(user);
+ return Response.ok(Utils.createMap("success", true, "token", tokenAuth)).build();
+ }
- /**
- * Check if current token is valid
- *
- * @param user
- * @param password
- * @param request
- * @return
- */
- @GET
- @Securable()
- @Path("/check")
- @Produces(
- { MediaType.APPLICATION_JSON })
- public Response check(@HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token, @QueryParam("token") String token2) {
- if (token == null)
- token = token2;
- if (token == null)
- return Response.status(Status.FORBIDDEN).build();
- boolean valid = tokenHelper.isTokenValid(token);
- if (!valid)
- return Response.status(Status.UNAUTHORIZED).build();
+ /**
+ * Check if current token is valid
+ *
+ * @param user
+ * @param password
+ * @param request
+ * @return
+ */
+ @GET
+ @Securable()
+ @Path("/check")
+ @Produces({ MediaType.APPLICATION_JSON })
+ public Response check(@HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token, @QueryParam("token") String token2) {
+ if (token == null) {
+ token = token2;
+ }
+ if (token == null) {
+ return Response.status(Status.FORBIDDEN).build();
+ }
+ boolean valid = tokenHelper.isTokenValid(token);
+ if (!valid) {
+ return Response.status(Status.UNAUTHORIZED).build();
+ }
- // LOG.info("Token : " + token);
- String user = tokenHelper.extractUserFromToken(token);
- // LOG.info("Token user: " + user);
- Date date = tokenHelper.extractDateCreationFromToken(token);
- // LOG.info("Token date: " + date);
+ String user = tokenHelper.extractUserFromToken(token);
+ Date date = tokenHelper.extractDateCreationFromToken(token);
- return Response.ok(Utils.createMap("valid", true, "user", user, "date", date)).build();
- }
+ return Response.ok(Utils.createMap("valid", true, "user", user, "date", date)).build();
+ }
- @GET
- @POST
- @Path("/logout")
- @Produces(
- { MediaType.APPLICATION_JSON })
- public Response logout(@HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
- if (token == null)
- Response.status(Status.BAD_REQUEST).build();
- String user = tokenHelper.extractUserFromToken(token);
- LOG.info("User {} has logged out", user);
- return Response.ok().build();
- }
+ @GET
+ @POST
+ @Path("/logout")
+ @Produces({ MediaType.APPLICATION_JSON })
+ public Response logout(@HeaderParam(TokenHelper.TOKEN_HEADER_PÀRAM) String token) {
+ if (token == null) {
+ Response.status(Status.BAD_REQUEST).build();
+ }
+ String user = tokenHelper.extractUserFromToken(token);
+ LOG.info("User {} has logged out", user);
+ return Response.ok().build();
+ }
}
--
Gitblit v1.3.2