configuration changes

.gitignore

@@ -15,7 +15,7 @@ dist
 /.settings
 .ecltarget
 
-conf/development.conf
+conf/graylog2-web-interface.conf
 
 .target
 .DS_Store

app/Global.java

@@ -135,6 +135,13 @@ public <A> A getControllerInstance(Class<A> controllerClass) throws Exception {
 
     @Override
     public Configuration onLoadConfig(Configuration configuration, File file, ClassLoader classLoader) {
+        /*
+         *
+         * This is merging the standard bundled application.conf with our graylog2-web-interface.conf.
+         * The application.conf must always be empty when packaged so there is nothing hidden from the user.
+         * We are merging, because the Configuration object alreay contains some information the web-interface needs.
+         *
+         */
         return new Configuration(
                 ConfigFactory.parseFileAnySyntax(new File("conf/graylog2-web-interface.conf"))
                         .withFallback(configuration.getWrappedConfiguration().underlying())

app/lib/security/PlayAuthenticationListener.java

@@ -38,7 +38,8 @@ public void onSuccess(AuthenticationToken token, AuthenticationInfo info) {
 
     @Override
     public void onFailure(AuthenticationToken token, AuthenticationException ae) {
-        // TODO keep metric of failed logins. maybe log to some graylog instance
+        final Http.Session session = Http.Context.current().session();
+        session.remove("sessionid");
     }
 
     @Override

conf/graylog2-web-interface.conf → conf/graylog2-web-interface.conf.example

@@ -1,8 +1,9 @@
-# graylog2-server REST URIs (one or more, comma separated)
-graylog2-server.uris="http://127.0.0.1:12900/,http://127.0.0.1:12910/"
+# graylog2-server REST URIs (one or more, comma separated) For example: "http://127.0.0.1:12900/,http://127.0.0.1:12910/"
+graylog2-server.uris=""
 
 # Secret key
 # ~~~~~
 # The secret key is used to secure cryptographics functions. Set this to a long and randomly generated string.
 # If you deploy your application to several instances be sure to use the same key!
-application.secret=""
+# Generate for example with: pwgen -s 96
+application.secret=""