From 12c3103039758a24c2a4473a74e1c9559a6804d7 Mon Sep 17 00:00:00 2001
From: Mihail Slobodyanuk <slobodyanukma@gmail.com>
Date: Tue, 13 Dec 2022 17:40:34 +0200
Subject: [PATCH] Revert "Fix RIVM-23"

This reverts commit f25344829658b9634f3f984e68450cafccd8c823.
---
 src/admin/admin.go | 55 +++++++++++++++++++---------------------------
 1 file changed, 23 insertions(+), 32 deletions(-)

diff --git a/src/admin/admin.go b/src/admin/admin.go
index dd174398..6cfb3201 100644
--- a/src/admin/admin.go
+++ b/src/admin/admin.go
@@ -5,17 +5,14 @@ import (
 	"errors"
 	"fmt"
 	"net"
-	"net/http"
 	"net/url"
+	"net/http"
 	"os"
 	"sort"
 
-	"archive/zip"
 	"strings"
 	"time"
 
-	"github.com/remyoudompheng/go-misc/zipfs"
-
 	"github.com/RiV-chain/RiV-mesh/src/config"
 	"github.com/RiV-chain/RiV-mesh/src/core"
 )
@@ -206,26 +203,26 @@ func (a *AdminSocket) SetupAdminHandlers() {
 			return res, nil
 		},
 	)
-	_ = a.AddHandler("addPeers", "Add peers to this node", []string{"uri", "[interface]"}, func(in json.RawMessage) (interface{}, error) {
-		req := &AddPeersRequest{}
-		res := &AddPeersResponse{}
+        _ = a.AddHandler("addPeers", "Add peers to this node", []string{"uri", "[interface]"}, func(in json.RawMessage) (interface{}, error) {
+                req := &AddPeersRequest{}
+                res := &AddPeersResponse{}
 
-		fmt.Println("json addpeers request %s", string(in[:]))
+                fmt.Println("json addpeers request %s", string(in[:]))
 
-		if err := json.Unmarshal(in, &req); err != nil {
-			return nil, err
-		}
+                if err := json.Unmarshal(in, &req); err != nil {
+                        return nil, err
+                }
 
-		if err := a.addPeersHandler(req, res); err != nil {
-			return nil, err
-		}
-		return res, nil
-	})
-	_ = a.AddHandler("removePeers", "Remove all peers from this node", []string{}, func(in json.RawMessage) (interface{}, error) {
-		a.core.RemovePeers()
-		res := &AddPeersResponse{}
-		return res, nil
-	})
+                if err := a.addPeersHandler(req, res); err != nil {
+                        return nil, err
+                }
+                return res, nil
+        })
+        _ = a.AddHandler("removePeers", "Remove all peers from this node", []string{}, func(in json.RawMessage) (interface{}, error) {
+                a.core.RemovePeers()
+                res := &AddPeersResponse{}
+                return res, nil
+        })
 
 	//_ = a.AddHandler("getNodeInfo", []string{"key"}, t.proto.nodeinfo.nodeInfoAdminHandler)
 	//_ = a.AddHandler("debug_remoteGetSelf", []string{"key"}, t.proto.getSelfHandler)
@@ -235,16 +232,16 @@ func (a *AdminSocket) SetupAdminHandlers() {
 
 // Start runs http server
 func (a *AdminSocket) StartHttpServer(nc *config.NodeConfig) {
-	if nc.HttpAddress != "none" && nc.HttpAddress != "" && nc.WwwRoot != "none" && nc.WwwRoot != "" {
+	if nc.HttpAddress != "none" && nc.HttpAddress != "" && nc.WwwRoot != "none" && nc.WwwRoot != ""{
 		u, err := url.Parse(nc.HttpAddress)
 		if err != nil {
 			a.log.Errorln("An error occurred parsing http address:", err)
 			return
 		}
-		http.HandleFunc("/api", func(w http.ResponseWriter, r *http.Request) {
+		http.HandleFunc("/api", func(w http.ResponseWriter, r *http.Request){
 			fmt.Fprintf(w, "Following methods are allowed: getself, getpeers. litening"+u.Host)
 		})
-		http.HandleFunc("/api/getself", func(w http.ResponseWriter, r *http.Request) {
+		http.HandleFunc("/api/getself", func(w http.ResponseWriter, r *http.Request){
 			w.Header().Add("Content-Type", "application/json")
 			req := &GetSelfRequest{}
 			res := &GetSelfResponse{}
@@ -257,7 +254,7 @@ func (a *AdminSocket) StartHttpServer(nc *config.NodeConfig) {
 			}
 			fmt.Fprintf(w, string(b[:]))
 		})
-		http.HandleFunc("/api/getpeers", func(w http.ResponseWriter, r *http.Request) {
+		http.HandleFunc("/api/getpeers", func(w http.ResponseWriter, r *http.Request){
 			w.Header().Add("Content-Type", "application/json")
 			req := &GetPeersRequest{}
 			res := &GetPeersResponse{}
@@ -271,13 +268,7 @@ func (a *AdminSocket) StartHttpServer(nc *config.NodeConfig) {
 			}
 			fmt.Fprintf(w, string(b[:]))
 		})
-		fs := http.Dir(nc.WwwRoot)
-		pak, err := zip.OpenReader(nc.WwwRoot)
-		if err == nil {
-			fs = zipfs.NewZipFS(&pak.Reader)
-			defer pak.Close()
-		}
-		http.Handle("/", http.FileServer(fs))
+		http.Handle("/", http.FileServer(http.Dir(nc.WwwRoot)))
 		l, e := net.Listen("tcp4", u.Host)
 		if e != nil {
 			a.log.Errorln("%s\n", e)