add allow/blocklist in info endpoint

Author: peterjah

server/api/read/models/de_web_info.go

@@ -66,3 +66,11 @@ definitions:
           chainID:
             type: integer
             format: int64
+      allowList:
+        type: array
+        items:
+          type: string
+      blockList:
+        type: array
+        items:
+          type: string

server/api/read/restapi/embedded_spec.go

@@ -124,5 +124,5 @@ func (a *API) configureAPI() {
 
 	a.DewebAPI.GetResourceHandler = operations.GetResourceHandlerFunc(getResourceHandler)
 	a.DewebAPI.DefaultPageHandler = operations.DefaultPageHandlerFunc(defaultPageHandler)
-	a.DewebAPI.GetDeWebInfoHandler = NewDewebInfo(a.Conf.MiscPublicInfoJson, a.Conf.NetworkInfos)
+	a.DewebAPI.GetDeWebInfoHandler = NewDewebInfo(a.Conf)
 }

server/api/readAPI-V0.yml

@@ -8,6 +8,7 @@ import (
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/massalabs/deweb-server/api/read/models"
 	"github.com/massalabs/deweb-server/api/read/restapi/operations"
+	userConfig "github.com/massalabs/deweb-server/int/api/config"
 	config "github.com/massalabs/station/int/config"
 	"github.com/massalabs/station/pkg/logger"
 )
@@ -32,12 +33,11 @@ func defaultPageHandler(params operations.DefaultPageParams) middleware.Responde
 
 /*Handle get deweb public infos*/
 type dewebInfo struct {
-	miscInfo    interface{}
-	networkInfo config.NetworkInfos
+	conf *userConfig.ServerConfig
 }
 
-func NewDewebInfo(miscInfo interface{}, networkInfo config.NetworkInfos) operations.GetDeWebInfoHandler {
-	return &dewebInfo{miscInfo: miscInfo, networkInfo: networkInfo}
+func NewDewebInfo(conf *userConfig.ServerConfig) operations.GetDeWebInfoHandler {
+	return &dewebInfo{conf}
 }
 
 func (dI *dewebInfo) Handle(params operations.GetDeWebInfoParams) middleware.Responder {
@@ -49,12 +49,14 @@ func (dI *dewebInfo) Handle(params operations.GetDeWebInfoParams) middleware.Res
 		operations.NewGetDeWebInfoOK().WithPayload(&models.DeWebInfo{
 			App:     "deweb",
 			Version: config.Version,
-			Misc:    dI.miscInfo,
+			Misc:    dI.conf.MiscPublicInfoJson,
 			Network: &models.DeWebInfoNetwork{
-				Network: dI.networkInfo.Network,
-				Version: dI.networkInfo.Version,
-				ChainID: int64(dI.networkInfo.ChainID),
+				Network: dI.conf.NetworkInfos.Network,
+				Version: dI.conf.NetworkInfos.Version,
+				ChainID: int64(dI.conf.NetworkInfos.ChainID),
 			},
+			AllowList: dI.conf.AllowList,
+			BlockList: dI.conf.BlockList,
 		}).WriteResponse(w, runtime)
 	})
 }

server/int/api/api.go

@@ -82,7 +82,7 @@ func SubdomainMiddleware(handler http.Handler, conf *config.ServerConfig) http.H
 			return
 		}
 
-		if !isWebsiteAllowed(address, subdomain, conf.AllowList, conf.BlockList) {
+		if !isWebsiteAllowed(address, subdomain, conf) {
 			logger.Warnf("Subdomain %s or address %s is not allowed", subdomain, address)
 
 			localHandler(w, notAvailableZip, path)
@@ -232,13 +232,13 @@ func getWebsiteResource(config *config.ServerConfig, websiteAddress, resourceNam
 // isWebsiteAllowed checks the allow and block lists and returns false if the address or domain is not allowed.
 // If the allow list is empty, all addresses and domains are allowed, except those in the block list.
 // Otherwise, only addresses and domains in the allow list are allowed.
-func isWebsiteAllowed(address string, domain string, allowList, blockList []string) bool {
-	if slices.Contains(blockList, address) || slices.Contains(blockList, domain) {
+func isWebsiteAllowed(address string, domain string, config *config.ServerConfig) bool {
+	if slices.Contains(config.BlockList, address) || slices.Contains(config.BlockList, domain) {
 		logger.Debugf("Address %s or domain %s is in the block list", address, domain)
 		return false
 	}
 
-	if len(allowList) > 0 && !slices.Contains(allowList, address) && !slices.Contains(allowList, domain) {
+	if len(config.AllowList) > 0 && !slices.Contains(config.AllowList, address) && !slices.Contains(config.AllowList, domain) {
 		logger.Debugf("Address %s or domain %s is not in the allow list", address, domain)
 		return false
 	}