partly working security: registration form, authorization, simple authentification

[proteocache.git] / server / compbio / controllers / IPDataController.java

diff --git a/server/compbio/controllers/IPDataController.java b/server/compbio/controllers/IPDataController.java
index 424a742..690c57e 100644 (file)
--- a/server/compbio/controllers/IPDataController.java
+++ b/server/compbio/controllers/IPDataController.java
@@ -1,5 +1,6 @@
 package compbio.controllers;
 
+import java.security.Principal;
 import java.util.List;
 import java.util.Map;
 
@@ -8,7 +9,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import compbio.cassandra.DataBase;
 import compbio.cassandra.TotalByCounterBean;
 import compbio.cassandra.UserBean;
 import compbio.statistic.CassandraRequester;
@@ -20,21 +20,23 @@ import compbio.statistic.CassandraRequester;
 @Controller
 public class IPDataController {
 
-       @RequestMapping(value = "/ip/stat", method = RequestMethod.GET)
-       public String initStatisticsForm(Map<String, Object> model) {
+       @RequestMapping(value = "/admin/ip/counts/query", method = RequestMethod.GET)
+       public String initStatisticsForm(Map<String, Object> model, Principal principal) {
+               model.put("username", principal.getName());
                model.put("value", 5);
                return "queryIPStatistics";
        }
 
-       @RequestMapping(value = "/ip", method = RequestMethod.GET)
-       public String initOneIPForm(Map<String, Object> model) {
+       @RequestMapping(value = "/admin/ip/query", method = RequestMethod.GET)
+       public String initOneIPForm(Map<String, Object> model, Principal principal) {
+               model.put("username", principal.getName());
                model.put("value", "127.0.0.1");
                return "queryIP";
        }
        
-       @RequestMapping(value = "/ip/stat/querycounter", method = RequestMethod.GET)
-       public String findIPwithCounter(@RequestParam("JobCounter") String counter, Map<String, Object> model) {
-
+       @RequestMapping(value = "/admin/ip/counts/results", method = RequestMethod.GET)
+       public String findIPwithCounter(@RequestParam("JobCounter") String counter, Map<String, Object> model, Principal principal) {
+               model.put("username", principal.getName());
                if (counter.equals("")) {
                        model.put("error", "The value must not be empty");
                        model.put("value", counter);
@@ -70,8 +72,9 @@ public class IPDataController {
                return "reportIPstatistics";
        }
 
-       @RequestMapping(value = "/ip/query", method = RequestMethod.GET)
-       public String findIP(@RequestParam("ip") String ip, Map<String, Object> model) {
+       @RequestMapping(value = "/admin/ip/results", method = RequestMethod.GET)
+       public String findIP(@RequestParam("ip") String ip, Map<String, Object> model, Principal principal) {
+               model.put("username", principal.getName());
                final long startTime = System.currentTimeMillis();
                CassandraRequester cr = new CassandraRequester();
                UserBean r = cr.readIp(ip);