Skip to content

Commit ab738c8

Browse files
nim4nim4
committed
Some chores & coverage improvement
1 parent a203b9e commit ab738c8

7 files changed

Lines changed: 53 additions & 18 deletions

File tree

‎README.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ DBShield 1.0.0-beta2
142142
Usage of DBShield:
143143
-c string
144144
Config file (default "/etc/dbshield.yml")
145-
-d Get list of captured patterns
145+
-l Get list of captured patterns
146146
-h Show help
147147
-k Show parsed config and exit
148148
-version
@@ -156,6 +156,11 @@ $ $GOPATH/bin/DBShield -c config.yml
156156
```
157157
see [sample configuration file](https://github.com/nim4/DBShield/blob/master/conf/dbshield.yml)
158158

159+
160+
>:warning: **WARNING:**
161+
> Do NOT use default certificates in production environments!
162+
163+
159164
---
160165
## Supports:
161166

‎assets/js/app.js‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
"use strict";
12
// Graph Labels
23
var names = ['Queries', 'Abnormal'];
34
var groups = new vis.DataSet();
@@ -77,8 +78,6 @@ function renderStep() {
7778
animation: true
7879
});
7980
}
80-
setTimeout(renderStep, 1000);
81-
8281
}
8382

8483

@@ -108,6 +107,7 @@ function ajax(init) {
108107
// To filter the first request
109108
yValuesOld = yValues;
110109
}
110+
renderStep()
111111
}
112112
};
113113
xhttp.onerror = function() {
@@ -118,11 +118,10 @@ function ajax(init) {
118118
}
119119
xhttp.open("GET", '/api?_=' + new Date().getTime(), true);
120120
xhttp.send();
121+
setTimeout(function() {
122+
ajax(false)
123+
}, 1000);
121124
}
122125

123-
renderStep();
124126
addDataPoint();
125127
ajax(true);
126-
setInterval(function() {
127-
ajax(false)
128-
}, 1000);

‎assets/report.htm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<meta content="utf-8" http-equiv="encoding">
77
<title>Realtime Graph | DBShield</title>
88

9-
<script src="js/vis.min.js"></script>
109
<link href="css/vis.min.css" rel="stylesheet" type="text/css" />
1110
<style>
1211
form {
@@ -52,14 +51,15 @@
5251
<body>
5352
<div id="visualization"></div>
5453

55-
<script src="js/app.js"></script>
5654
<div>
5755
<form method="post" action="/logout">
5856
<div id="lower">
5957
<input type="submit" value="Logout">
6058
</div>
6159
</form>
6260
</div>
61+
<script src="js/vis.min.js"></script>
62+
<script src="js/app.js"></script>
6363
</body>
6464

6565
</html>

‎dbshield/dbms/mysql.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ func (m *MySQL) Handler() error {
7676
logger.Infof("Using database: %v", m.currentDB)
7777
case 0x03: //Query
7878
query := data[1:]
79-
logger.Infof("Query: %s", query)
8079
context := sql.QueryContext{
8180
Query: string(query),
8281
Database: m.currentDB,

‎dbshield/dbshield.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
)
2020

2121
//Version of the library
22-
var Version = "1.0.0-beta2"
22+
var Version = "1.0.0-beta3"
2323

2424
var configFile string
2525

‎main.go‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func main() {
2222

2323
//Parsing command line arguments
2424
config := flag.String("c", "/etc/dbshield.yml", "Config file")
25-
listPatterns := flag.Bool("d", false, "Get list of captured patterns")
25+
listPatterns := flag.Bool("l", false, "Get list of captured patterns")
2626
checkConfig := flag.Bool("k", false, "Show parsed config and exit")
2727
showVersion := flag.Bool("version", false, "Show version")
2828
showHelp := flag.Bool("h", false, "Show help")
@@ -44,16 +44,14 @@ func main() {
4444
}
4545

4646
if *listPatterns {
47-
if err := dbshield.Patterns(); err != nil {
48-
log.Println(err)
49-
}
47+
err := dbshield.Patterns()
48+
log.Println(err)
5049
return
5150
}
5251

5352
if *checkConfig {
54-
if err := dbshield.Check(); err != nil {
55-
log.Println(err)
56-
}
53+
err := dbshield.Check()
54+
log.Println(err)
5755
return
5856
}
5957

‎main_test.go‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,47 @@
11
package main
22

33
import (
4+
"bytes"
5+
"flag"
6+
"io/ioutil"
47
"os"
58
"testing"
69
)
710

811
func Test(t *testing.T) {
912
usage(true)
1013

14+
//
1115
os.Args = []string{os.Args[0], "-k", "-c", "conf/dbshield.yml"}
1216
main()
17+
18+
flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
19+
os.Args = []string{os.Args[0], "-k", "-c", "conf/invalid.yml"}
20+
main()
21+
22+
flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
23+
os.Args = []string{os.Args[0], "-l"}
24+
main()
25+
26+
flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
27+
os.Args = []string{os.Args[0], "-version"}
28+
main()
29+
30+
flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
31+
os.Args = []string{os.Args[0], "-h"}
32+
main()
33+
34+
flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
35+
dat, err := ioutil.ReadFile("conf/dbshield.yml")
36+
if err != nil {
37+
t.Fatal(err)
38+
}
39+
dat = bytes.Replace(dat, []byte("dbDir: "), []byte("dbDir: /INVALID"), 1)
40+
path := os.TempDir() + "/tempconfig.yml"
41+
err = ioutil.WriteFile(path, dat, 0600)
42+
if err != nil {
43+
t.Fatal(err)
44+
}
45+
os.Args = []string{os.Args[0], "-k", "-c", path}
46+
main()
1347
}

0 commit comments

Comments
 (0)