diff --git a/socketserver/cmd/ffzsocketserver/console.go b/socketserver/cmd/ffzsocketserver/console.go
index d202330f..a09399b7 100644
--- a/socketserver/cmd/ffzsocketserver/console.go
+++ b/socketserver/cmd/ffzsocketserver/console.go
@@ -4,9 +4,9 @@ import (
"../../internal/server"
"fmt"
"github.com/abiosoft/ishell"
+ "github.com/gorilla/websocket"
"runtime"
"strings"
- "github.com/gorilla/websocket"
)
func commandLineConsole() {
@@ -69,4 +69,3 @@ func commandLineConsole() {
shell.Start()
}
-
diff --git a/socketserver/cmd/ffzsocketserver/index.html b/socketserver/cmd/ffzsocketserver/index.html
new file mode 100644
index 00000000..e28ce2ee
--- /dev/null
+++ b/socketserver/cmd/ffzsocketserver/index.html
@@ -0,0 +1,13 @@
+
+CatBag
+
+
diff --git a/socketserver/cmd/ffzsocketserver/socketserver.go b/socketserver/cmd/ffzsocketserver/socketserver.go
index a804476a..f8bf8c19 100644
--- a/socketserver/cmd/ffzsocketserver/socketserver.go
+++ b/socketserver/cmd/ffzsocketserver/socketserver.go
@@ -44,7 +44,7 @@ func main() {
Addr: conf.ListenAddr,
}
- logFile, err := os.OpenFile("output.log", os.O_WRONLY | os.O_APPEND | os.O_CREATE, 0644)
+ logFile, err := os.OpenFile("output.log", os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)
if err != nil {
log.Fatal("Could not create logfile: ", err)
}
diff --git a/socketserver/internal/server/backend.go b/socketserver/internal/server/backend.go
index a7528a39..08547026 100644
--- a/socketserver/internal/server/backend.go
+++ b/socketserver/internal/server/backend.go
@@ -157,7 +157,7 @@ func RequestRemoteData(remoteCommand, data string, auth AuthInfo) (responseStr s
return
}
-func SendAggregatedData(sealedForm url.Values) (error) {
+func SendAggregatedData(sealedForm url.Values) error {
resp, err := backendHttpClient.PostForm(postStatisticsUrl, sealedForm)
if err != nil {
return err
@@ -196,21 +196,6 @@ func GenerateKeys(outputFile, serverId, theirPublicStr string) {
ListenAddr: "0.0.0.0:8001",
SocketOrigin: "localhost:8001",
BackendUrl: "http://localhost:8002/ffz",
- BannerHTML: `
-
-CatBag
-
-
-`,
}
output.ServerId, err = strconv.Atoi(serverId)
diff --git a/socketserver/internal/server/commands.go b/socketserver/internal/server/commands.go
index c0f2e8b7..0a2cf538 100644
--- a/socketserver/internal/server/commands.go
+++ b/socketserver/internal/server/commands.go
@@ -6,10 +6,10 @@ import (
"github.com/gorilla/websocket"
"github.com/satori/go.uuid"
"log"
+ "net/url"
"strconv"
"sync"
"time"
- "net/url"
)
var ResponseSuccess = ClientMessage{Command: SuccessCommand}
diff --git a/socketserver/internal/server/handlecore.go b/socketserver/internal/server/handlecore.go
index 6c2451ce..ff3b786c 100644
--- a/socketserver/internal/server/handlecore.go
+++ b/socketserver/internal/server/handlecore.go
@@ -6,6 +6,7 @@ import (
"fmt"
"github.com/gorilla/websocket"
"io"
+ "io/ioutil"
"log"
"net/http"
"strconv"
@@ -74,6 +75,8 @@ var ExpectedStringAndIntGotFloat = errors.New("Error: Second argument was a floa
var gconfig *ConfigFile
+var BannerHTML []byte
+
// Set up a websocket listener and register it on /.
// (Uses http.DefaultServeMux .)
func SetupServerAndHandle(config *ConfigFile, serveMux *http.ServeMux) {
@@ -85,6 +88,12 @@ func SetupServerAndHandle(config *ConfigFile, serveMux *http.ServeMux) {
serveMux = http.DefaultServeMux
}
+ bannerBytes, err := ioutil.ReadFile("index.html")
+ if err != nil {
+ log.Fatal("Could not open index.html", err)
+ }
+ BannerHTML = bannerBytes
+
serveMux.HandleFunc("/", ServeWebsocketOrCatbag)
serveMux.HandleFunc("/pub_msg", HBackendPublishRequest)
serveMux.HandleFunc("/dump_backlog", HBackendDumpBacklog)
@@ -106,7 +115,7 @@ func ServeWebsocketOrCatbag(w http.ResponseWriter, r *http.Request) {
return
} else {
- w.Write([]byte(gconfig.BannerHTML))
+ w.Write(BannerHTML)
}
}
diff --git a/socketserver/internal/server/types.go b/socketserver/internal/server/types.go
index cc9ba947..76123277 100644
--- a/socketserver/internal/server/types.go
+++ b/socketserver/internal/server/types.go
@@ -17,8 +17,6 @@ type ConfigFile struct {
SocketOrigin string
// URL to the backend server
BackendUrl string
- // Memes go here
- BannerHTML string
// SSL/TLS
UseSSL bool