Fix RIVM-23

This commit is contained in:
Mihail Slobodyanuk 2022-12-13 17:38:45 +02:00
parent 2003d1ca03
commit f253448296

View file

@ -5,14 +5,17 @@ import (
"errors" "errors"
"fmt" "fmt"
"net" "net"
"net/url"
"net/http" "net/http"
"net/url"
"os" "os"
"sort" "sort"
"archive/zip"
"strings" "strings"
"time" "time"
"github.com/remyoudompheng/go-misc/zipfs"
"github.com/RiV-chain/RiV-mesh/src/config" "github.com/RiV-chain/RiV-mesh/src/config"
"github.com/RiV-chain/RiV-mesh/src/core" "github.com/RiV-chain/RiV-mesh/src/core"
) )
@ -268,7 +271,13 @@ func (a *AdminSocket) StartHttpServer(nc *config.NodeConfig) {
} }
fmt.Fprintf(w, string(b[:])) fmt.Fprintf(w, string(b[:]))
}) })
http.Handle("/", http.FileServer(http.Dir(nc.WwwRoot))) 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))
l, e := net.Listen("tcp4", u.Host) l, e := net.Listen("tcp4", u.Host)
if e != nil { if e != nil {
a.log.Errorln("%s\n", e) a.log.Errorln("%s\n", e)