Added a non working servlet in web.xml

src/jrds/webapp/Discover.java

@@ -30,6 +30,7 @@
 /**
  * Servlet implementation class AutoDetect
  */
+@ServletSecurity
 public class Discover extends JrdsServlet {
     static final private Logger logger = Logger.getLogger(Discover.class);
 

src/jrds/webapp/JSonTree.java

@@ -22,6 +22,7 @@
 /**
  * Servlet implementation class JSonTree
  */
+@ServletSecurity
 public class JSonTree extends JSonData {
     static final private Logger logger = Logger.getLogger(JSonTree.class);
 

src/jrds/webapp/Status.java

@@ -10,17 +10,18 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.json.JSONException;
+
 import jrds.HostInfo;
 import jrds.HostsList;
 import jrds.starter.Timer;
 import jrds.starter.Timer.Stats;
 
-import org.json.JSONException;
-
 /**
  * A few stats for jrds inner status
  * @author Fabrice Bacchella
  */
+@ServletSecurity
 public class Status extends JrdsServlet {
 
     /**
@@ -32,8 +33,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse res)
         HostsList hl = getHostsList();
 
         ParamsBean params = new ParamsBean(req, hl);
-        if(! allowed(params, getPropertiesManager().defaultRoles)) {
-            res.setStatus(HttpServletResponse.SC_FORBIDDEN);
+        if(! allowed(params, ACL.ALLOWEDACL, req, res)) {
             return;
         }
 

web/WEB-INF/web.xml

@@ -117,12 +117,6 @@
         <servlet-class>
             jrds.webapp.GetDiscoverHtmlCode</servlet-class>
     </servlet>
-    <servlet>
-        <servlet-name>GetGraph</servlet-name>
-        <display-name>GetGraph</display-name>
-        <description></description>
-        <servlet-class>jrds.webapp.GetGraph</servlet-class>
-    </servlet>
     <servlet-mapping>
         <servlet-name>CheckValues</servlet-name>
         <url-pattern>/values/*</url-pattern>
@@ -208,10 +202,6 @@
         <servlet-name>GetDiscoverHtmlCode</servlet-name>
         <url-pattern>/discoverhtml</url-pattern>
     </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>GetGraph</servlet-name>
-        <url-pattern>/getgraph</url-pattern>
-    </servlet-mapping>
     <welcome-file-list>
         <welcome-file>index.html</welcome-file>
     </welcome-file-list>