A. Yeung 4 rokov pred
rodič
commit
9f8ef297c7
8 zmenil súbory, kde vykonal 125 pridanie a 29 odobranie
  1. BIN
      __debug_bin
  2. 45 0
      mc_add.go
  3. 33 0
      mc_del.go
  4. 20 0
      mc_edit.go
  5. 5 5
      mod/config/eula.go
  6. 5 5
      mod/config/properties.go
  7. 2 2
      mod/config/struct.go
  8. 15 17
      web.go

BIN
__debug_bin


+ 45 - 0
mc_add.go

@@ -0,0 +1,45 @@
+package main
+
+import (
+	"net/http"
+	"strconv"
+)
+
+func AddBanIP(w http.ResponseWriter, r *http.Request) {
+	IP, _ := mv(r, "IP", false)
+	Created, _ := mv(r, "Created", false)
+	Source, _ := mv(r, "Source", false)
+	Expires, _ := mv(r, "Expires", false)
+	Reason, _ := mv(r, "Reason", false)
+	Config.WriteBannedIP(IP, Created, Source, Expires, Reason)
+	sendJSONResponse(w, "OK")
+}
+
+func AddBanPlayer(w http.ResponseWriter, r *http.Request) {
+	UUID, _ := mv(r, "UUID", false)
+	Name, _ := mv(r, "Name", false)
+	Created, _ := mv(r, "Created", false)
+	Source, _ := mv(r, "Source", false)
+	Expires, _ := mv(r, "Expires", false)
+	Reason, _ := mv(r, "Reason", false)
+	Config.WriteBannedPlayer(UUID, Name, Created, Source, Expires, Reason)
+	sendJSONResponse(w, "OK")
+}
+
+func AddOps(w http.ResponseWriter, r *http.Request) {
+	UUID, _ := mv(r, "UUID", false)
+	Name, _ := mv(r, "Name", false)
+	Level, _ := mv(r, "Level", false)
+	LevelI, _ := strconv.Atoi(Level)
+	BypassesPlayerLimit, _ := mv(r, "BypassesPlayerLimit", false)
+	BypassesPlayerLimitB, _ := strconv.ParseBool(BypassesPlayerLimit)
+	Config.WriteOps(UUID, Name, LevelI, BypassesPlayerLimitB)
+	sendJSONResponse(w, "OK")
+}
+
+func AddWhitelist(w http.ResponseWriter, r *http.Request) {
+	UUID, _ := mv(r, "UUID", false)
+	Name, _ := mv(r, "Name", false)
+	Config.WriteWhitelist(UUID, Name)
+	sendJSONResponse(w, "OK")
+}

+ 33 - 0
mc_del.go

@@ -0,0 +1,33 @@
+package main
+
+import (
+	"net/http"
+)
+
+func RemoveBanIP(w http.ResponseWriter, r *http.Request) {
+	search, _ := mv(r, "search", false)
+	field, _ := mv(r, "field", false)
+	Config.RemoveBannedIP(search, field)
+	sendJSONResponse(w, "OK")
+}
+
+func RemoveBanPlayer(w http.ResponseWriter, r *http.Request) {
+	search, _ := mv(r, "search", false)
+	field, _ := mv(r, "field", false)
+	Config.RemoveBannedPlayer(search, field)
+	sendJSONResponse(w, "OK")
+}
+
+func RemoveOps(w http.ResponseWriter, r *http.Request) {
+	search, _ := mv(r, "search", false)
+	field, _ := mv(r, "field", false)
+	Config.RemoveOps(search, field)
+	sendJSONResponse(w, "OK")
+}
+
+func RemoveWhitelist(w http.ResponseWriter, r *http.Request) {
+	search, _ := mv(r, "search", false)
+	field, _ := mv(r, "field", false)
+	Config.RemoveWhitelist(search, field)
+	sendJSONResponse(w, "OK")
+}

+ 20 - 0
mc_edit.go

@@ -0,0 +1,20 @@
+package main
+
+import (
+	"net/http"
+	"strconv"
+)
+
+func ChangeEULA(w http.ResponseWriter, r *http.Request) {
+	value, _ := mv(r, "value", false)
+	Convertedvalue, _ := strconv.ParseBool(value)
+	Config.WriteEULA(Convertedvalue)
+	sendJSONResponse(w, "OK")
+}
+
+func ChangeProperties(w http.ResponseWriter, r *http.Request) {
+	key, _ := mv(r, "key", false)
+	value, _ := mv(r, "value", false)
+	Config.ChangeProperties(key, value)
+	sendJSONResponse(w, "OK")
+}

+ 5 - 5
mod/config/eula.go

@@ -23,8 +23,8 @@ func initEULA(serverFolder string) []ServerConfig {
 		regexSubmatch := regex.FindStringSubmatch(line)
 		if len(regexSubmatch) > 0 {
 			item := ServerConfig{
-				key:   regexSubmatch[1],
-				value: regexSubmatch[2],
+				Key:   strings.TrimSpace(regexSubmatch[1]),
+				Value: strings.TrimSpace(regexSubmatch[2]),
 			}
 			properties = append(properties, item)
 		}
@@ -34,13 +34,13 @@ func initEULA(serverFolder string) []ServerConfig {
 
 //ReadEULA should exported.
 func (mch *Handler) ReadEULA() bool {
-	b, _ := strconv.ParseBool(mch.eula[0].value)
+	b, _ := strconv.ParseBool(mch.eula[0].Value)
 	return b
 }
 
 //WriteEULA should exported.
 func (mch *Handler) WriteEULA(accept bool) bool {
-	mch.eula[0].value = strconv.FormatBool(accept)
+	mch.eula[0].Value = strconv.FormatBool(accept)
 	return true
 }
 
@@ -48,7 +48,7 @@ func (mch *Handler) WriteEULA(accept bool) bool {
 func (mch *Handler) SaveEULA() bool {
 	TXT := "#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).\n"
 	for _, line := range mch.eula {
-		TXT += line.key + "=" + line.value + "\n"
+		TXT += line.Key + "=" + line.Value + "\n"
 	}
 	err := ioutil.WriteFile(mch.serverFolder+"/eula.txt", []byte(TXT), 0777)
 	if err != nil {

+ 5 - 5
mod/config/properties.go

@@ -23,8 +23,8 @@ func initProperties(serverFolder string) []ServerConfig {
 		regexSubmatch := regex.FindStringSubmatch(line)
 		if len(regexSubmatch) > 0 {
 			item := ServerConfig{
-				key:   regexSubmatch[1],
-				value: regexSubmatch[2],
+				Key:   strings.TrimSpace(regexSubmatch[1]),
+				Value: strings.TrimSpace(regexSubmatch[2]),
 			}
 			properties = append(properties, item)
 		}
@@ -40,8 +40,8 @@ func (mch *Handler) ReadAllProperties() []ServerConfig {
 //ChangeProperties is exported function
 func (mch *Handler) ChangeProperties(inputKey string, inputValue string) bool {
 	for i, item := range mch.properties {
-		if strings.ToLower(inputKey) == strings.ToLower(item.key) {
-			mch.properties[i].value = inputValue
+		if strings.ToLower(inputKey) == strings.ToLower(item.Key) {
+			mch.properties[i].Value = inputValue
 		}
 	}
 	return true
@@ -51,7 +51,7 @@ func (mch *Handler) ChangeProperties(inputKey string, inputValue string) bool {
 func (mch *Handler) SaveProperties() bool {
 	TXT := "#Minecraft server properties"
 	for _, line := range mch.properties {
-		TXT += line.key + "=" + line.value + "\n"
+		TXT += line.Key + "=" + line.Value + "\n"
 	}
 	err := ioutil.WriteFile(mch.serverFolder+"/server.properties", []byte(TXT), 0777)
 	if err != nil {

+ 2 - 2
mod/config/struct.go

@@ -35,6 +35,6 @@ type Whitelist []struct {
 
 //ServerConfig is exported function
 type ServerConfig struct {
-	key   string
-	value string
+	Key   string `json:"key"`
+	Value string `json:"value"`
 }

+ 15 - 17
web.go

@@ -32,23 +32,21 @@ func webServer(Dir string, ImgDir string, Port string) {
 	http.HandleFunc("/properties", ReadProperties)
 	http.HandleFunc("/whitelist", ReadWhitelist)
 
-	/*
-		//EDIT
-		http.HandleFunc("/eula/change", ChangeEULA)
-		http.HandleFunc("/properties/change", ChangeProperties)
-
-		//ADD
-		http.HandleFunc("/ban-ip/add", AddBanIP)
-		http.HandleFunc("/ban-player/add", AddBanPlayer)
-		http.HandleFunc("/ops/add", AddOps)
-		http.HandleFunc("/whitelist/add", AddWhitelist)
-
-		//REMOVE
-		http.HandleFunc("/ban-ip/remove", RemoveBanIP)
-		http.HandleFunc("/ban-player/remove", RemoveBanPlayer)
-		http.HandleFunc("/ops/remove", RemoveOps)
-		http.HandleFunc("/whitelist/remove", RemoveWhitelist)
-	*/
+	//EDIT
+	http.HandleFunc("/eula/change", ChangeEULA)
+	http.HandleFunc("/properties/change", ChangeProperties)
+
+	//ADD
+	http.HandleFunc("/ban-ip/add", AddBanIP)
+	http.HandleFunc("/ban-player/add", AddBanPlayer)
+	http.HandleFunc("/ops/add", AddOps)
+	http.HandleFunc("/whitelist/add", AddWhitelist)
+
+	//REMOVE
+	http.HandleFunc("/ban-ip/remove", RemoveBanIP)
+	http.HandleFunc("/ban-player/remove", RemoveBanPlayer)
+	http.HandleFunc("/ops/remove", RemoveOps)
+	http.HandleFunc("/whitelist/remove", RemoveWhitelist)
 
 	err := http.ListenAndServe(":"+Port, nil)
 	if err != nil {