diff --git a/load.js b/load.js
new file mode 100644
index 0000000..446c226
--- /dev/null
+++ b/load.js
@@ -0,0 +1,56 @@
+function imgLoad(image) {
+ 'use strict';
+ // Create new promise with the Promise() constructor;
+ // This has as its argument a function with two parameters, resolve and reject
+ return new Promise(function (resolve, reject) {
+ // Standard XHR to load an image
+ var request = new XMLHttpRequest();
+ var url = 'http://127.0.0.1:4444/data/sshd/'+image+'.svg'
+ request.open('GET', url);
+ request.responseType = 'blob';
+
+ // When the request loads, check whether it was successful
+ request.onload = function () {
+ if (request.status === 200) {
+ // If successful, resolve the promise by passing back the request response
+ resolve(request.response);
+ } else {
+ // If it fails, reject the promise with a error message
+ reject(new Error('Image didn\'t load successfully; error code:' + request.statusText));
+ }
+ };
+
+ request.onerror = function () {
+ // Also deal with the case when the entire request fails to begin with
+ // This is probably a network error, so reject the promise with an appropriate message
+ reject(new Error('There was a network error.'));
+ };
+
+ // Send the request
+ request.send();
+ });
+}
+
+function loadImage(date, type) {
+ 'use strict';
+ console.log(date);
+ console.log(type);
+ // Get a reference to the body element, and create a new image object
+ var holder = document.querySelector('#imageholder'),
+ myImage = new Image();
+
+ myImage.crossOrigin = ""; // or "anonymous"
+
+ // Call the function with the URL we want to load, but then chain the
+ // promise then() method on to the end of it. This contains two callbacks
+ imgLoad(date+'/'+date+':'+type).then(function (response) {
+ // The first runs when the promise resolves, with the request.reponse specified within the resolve() method.
+ var imageURL = window.URL.createObjectURL(response);
+ myImage.src = imageURL;
+ holder.innerHTML = "";
+ holder.appendChild(myImage);
+ // The second runs when the promise is rejected, and logs the Error specified with the reject() method.
+ }, function (Error) {
+ console.log(Error);
+ });
+}
\ No newline at end of file
diff --git a/logparser/sshd.go b/logparser/sshd.go
index f78032c..6408deb 100644
--- a/logparser/sshd.go
+++ b/logparser/sshd.go
@@ -2,6 +2,7 @@ package logparser
import (
"fmt"
+ "html/template"
"log"
"math"
"os"
@@ -83,7 +84,7 @@ func (s *SshdParser) Parse(logline string) error {
// Check if dates are the same
if oldest != dstr {
// Check who is the oldest
- parsedOldest, _ := time.Parse("2006-01-02", oldest)
+ parsedOldest, _ := time.Parse("20060102", oldest)
if parsedTime.Before(parsedOldest) {
r.Do("SET", "oldest", dstr)
}
@@ -101,7 +102,7 @@ func (s *SshdParser) Parse(logline string) error {
// Check if dates are the same
if newest != dstr {
// Check who is the newest
- parsedNewest, _ := time.Parse("2006-01-02", newest)
+ parsedNewest, _ := time.Parse("20060102", newest)
if parsedTime.After(parsedNewest) {
r.Do("SET", "newest", dstr)
}
@@ -228,6 +229,95 @@ func (s *SshdParser) Compile() error {
}
}
+ // Write html file for navigating plots
+ const tpl = `
+
+
+
+
+ {{.Title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `
+
+ // Get oldest / newest entries
+ var newest string
+ var oldest string
+ if newest, err = redis.String(r.Do("GET", "newest")); err == redis.ErrNil {
+ r.Close()
+ return err
+ }
+ if oldest, err = redis.String(r.Do("GET", "oldest")); err == redis.ErrNil {
+ r.Close()
+ return err
+ }
+ parsedOldest, _ := time.Parse("20060102", oldest)
+ parsedNewest, _ := time.Parse("20060102", newest)
+ parsedOldestStr := parsedOldest.Format("2006-01-02")
+ parsedNewestStr := parsedNewest.Format("2006-01-02")
+
+ check := func(err error) {
+ if err != nil {
+ log.Fatal(err)
+ }
+ }
+ t, err := template.New("webpage").Parse(tpl)
+ check(err)
+
+ data := struct {
+ Title string
+ Current string
+ MinDate string
+ MaxDate string
+ }{
+ Title: "sshd failed logins statistics",
+ MinDate: parsedOldestStr,
+ MaxDate: parsedNewestStr,
+ Current: newest,
+ }
+ f, err := os.OpenFile("statistics.html", os.O_RDWR|os.O_CREATE, 0666)
+ defer f.Close()
+ err = t.Execute(f, data)
+ check(err)
+
return nil
}
@@ -286,7 +376,6 @@ func plotStats(s *SshdParser, v string) error {
p.NominalY(keys...)
// Create folder to store plots
-
if _, err := os.Stat("data"); os.IsNotExist(err) {
err := os.Mkdir("data", 0700)
if err != nil {
@@ -294,15 +383,22 @@ func plotStats(s *SshdParser, v string) error {
}
}
- if _, err := os.Stat(filepath.Join("data", stype[0])); os.IsNotExist(err) {
- err := os.Mkdir(filepath.Join("data", stype[0]), 0700)
+ if _, err := os.Stat(filepath.Join("data", "sshd")); os.IsNotExist(err) {
+ err := os.Mkdir(filepath.Join("data", "sshd"), 0700)
+ if err != nil {
+ return err
+ }
+ }
+
+ if _, err := os.Stat(filepath.Join("data", "sshd", stype[0])); os.IsNotExist(err) {
+ err := os.Mkdir(filepath.Join("data", "sshd", stype[0]), 0700)
if err != nil {
return err
}
}
xsize := 3 + vg.Length(math.Round(float64(len(keys)/2)))
- if err := p.Save(15*vg.Centimeter, xsize*vg.Centimeter, filepath.Join("data", stype[0], fmt.Sprintf("%v.svg", v))); err != nil {
+ if err := p.Save(15*vg.Centimeter, xsize*vg.Centimeter, filepath.Join("data", "sshd", stype[0], fmt.Sprintf("%v.svg", v))); err != nil {
return err
}