Skip to content
Closed
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
4ed5650
Create handler.go
crStiv Dec 25, 2024
2ac2555
feat(server): add swagger UI configuration
crStiv Dec 25, 2024
8930230
feat(server): integrate swagger UI setup
crStiv Dec 25, 2024
c812722
Create server.go
crStiv Dec 26, 2024
d0c20bc
Update config.go
crStiv Dec 26, 2024
ac5982a
Update config.go
crStiv Dec 26, 2024
f96dafe
Update handler.go
crStiv Dec 26, 2024
9859c38
Update server.go
crStiv Dec 26, 2024
e96e5bb
return original code
crStiv Dec 26, 2024
e733362
Update handler.go
crStiv Jan 6, 2025
34eab36
Update server.go
crStiv Jan 6, 2025
eec89d7
Update config.go
crStiv Jan 6, 2025
654cc99
Update app.go
crStiv Jan 6, 2025
c9d6544
Create doc.go
crStiv Jan 6, 2025
16556c1
Update commands.go
crStiv Jan 6, 2025
2021911
Update app.go
crStiv Jan 6, 2025
93dc4b6
Update handler.go
crStiv Jan 6, 2025
446c0f8
Update handler.go
crStiv Jan 7, 2025
c038d6c
Update doc.go
crStiv Jan 7, 2025
0938d61
Update config.go
crStiv Jan 7, 2025
2466ab5
Update handler.go
crStiv Jan 7, 2025
8a042b2
Update commands.go
crStiv Jan 7, 2025
8ccb884
Update doc.go
crStiv Jan 7, 2025
9659ba7
Update server.go
crStiv Jan 7, 2025
8f3017c
Merge branch 'main' into feat/add-swagger-ui
crStiv Jan 7, 2025
0fa0b6b
Update server.go
crStiv Jan 8, 2025
35f2fad
Update handler.go
crStiv Jan 8, 2025
44da58f
Update server.go
crStiv Jan 8, 2025
98f2d85
Update server.go
crStiv Jan 11, 2025
a3dbbe8
Merge branch 'main' into feat/add-swagger-ui
crStiv Jan 11, 2025
d88e065
Update server.go
crStiv Jan 19, 2025
54fe590
Update doc.go
crStiv Jan 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions server/v2/api/swagger/config.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package swagger

import (
"fmt"

"cosmossdk.io/core/server"
)

const ServerName = "swagger"

// Config defines the configuration for the Swagger UI server
type Config struct {
Enable bool `toml:"enable" mapstructure:"enable"`
Address string `toml:"address" mapstructure:"address"`
Path string `toml:"path" mapstructure:"path"`
}

// DefaultConfig returns the default configuration
func DefaultConfig() *Config {
return &Config{
Enable: true,
Address: "localhost:8080",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's use something else than 8080 by default

Path: "/swagger/",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need a path? I think keeping /swagger by default is great.

}
}

// Validate checks the configuration
func (c Config) Validate() error {
if c.Path == "" {
return fmt.Errorf("swagger path cannot be empty")
}
return nil
}

// CfgOption defines a function for configuring the settings
type CfgOption func(*Config)
85 changes: 85 additions & 0 deletions server/v2/api/swagger/handler.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
package swagger

import (
"io"
"net/http"
"path/filepath"
"strings"
"time"

"github.com/rakyll/statik/fs"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Add Required Dependency for Statik

The pipeline indicates that the module github.com/rakyll/statik/fs is missing from project dependencies. Update your go.mod by explicitly adding this dependency to avoid build failures.

Would you like assistance creating a diff to add github.com/rakyll/statik to your go.mod file?

🧰 Tools
🪛 GitHub Actions: Dependency Review

[error] 10-10: Missing required module: github.com/rakyll/statik/fs. Module needs to be added to the project dependencies.

)

// Handler returns an HTTP handler for Swagger UI
func Handler() http.Handler {
Copy link
Contributor

@julienrbrt julienrbrt Jan 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: let's not expose this and just use swaggerHandler{} in the handler registration

return &swaggerHandler{}
}

type swaggerHandler struct{}

func (h *swaggerHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// Set CORS headers
w.Header().Set("Access-Control-Allow-Origin", "*")
w.Header().Set("Access-Control-Allow-Methods", "GET, POST, OPTIONS")
w.Header().Set("Access-Control-Allow-Headers", "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type")

if r.Method == http.MethodOptions {
return
}

// Get the static file system
statikFS, err := fs.New()
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}

// Process the path
urlPath := strings.TrimPrefix(r.URL.Path, "/swagger")
if urlPath == "" || urlPath == "/" {
urlPath = "/index.html"
}

// Open the file
file, err := statikFS.Open(urlPath)
if err != nil {
http.Error(w, "File not found", http.StatusNotFound)
return
}
defer file.Close()

// Set the content-type
ext := filepath.Ext(urlPath)
if ct := getContentType(ext); ct != "" {
w.Header().Set("Content-Type", ct)
}

// Set caching headers
w.Header().Set("Cache-Control", "public, max-age=31536000")
w.Header().Set("Last-Modified", time.Now().UTC().Format(http.TimeFormat))

// Serve the file
http.ServeContent(w, r, urlPath, time.Now(), file.(io.ReadSeeker))

Check warning

Code scanning / CodeQL

Calling the system time Warning

Calling the system time may be a possible source of non-determinism
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Optimize caching implementation and add security headers.

  1. Use a constant time for Last-Modified to ensure deterministic behavior
  2. Add security headers to protect against common web vulnerabilities
 // Set caching headers
 w.Header().Set("Cache-Control", "public, max-age=31536000")
-w.Header().Set("Last-Modified", time.Now().UTC().Format(http.TimeFormat))
+// Use a fixed timestamp for deterministic behavior
+w.Header().Set("Last-Modified", "Mon, 01 Jan 2024 00:00:00 GMT")
+
+// Add security headers
+w.Header().Set("X-Content-Type-Options", "nosniff")
+w.Header().Set("X-Frame-Options", "DENY")
+w.Header().Set("Content-Security-Policy", "default-src 'self'")

-http.ServeContent(w, r, urlPath, time.Now(), file.(io.ReadSeeker))
+http.ServeContent(w, r, urlPath, time.Unix(0, 0), file.(io.ReadSeeker))
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
// Set caching headers
w.Header().Set("Cache-Control", "public, max-age=31536000")
w.Header().Set("Last-Modified", time.Now().UTC().Format(http.TimeFormat))
// Serve the file
http.ServeContent(w, r, urlPath, time.Now(), file.(io.ReadSeeker))
// Set caching headers
w.Header().Set("Cache-Control", "public, max-age=31536000")
// Use a fixed timestamp for deterministic behavior
w.Header().Set("Last-Modified", "Mon, 01 Jan 2024 00:00:00 GMT")
// Add security headers
w.Header().Set("X-Content-Type-Options", "nosniff")
w.Header().Set("X-Frame-Options", "DENY")
w.Header().Set("Content-Security-Policy", "default-src 'self'")
// Serve the file
http.ServeContent(w, r, urlPath, time.Unix(0, 0), file.(io.ReadSeeker))

}

// getContentType returns the content-type for a file extension
func getContentType(ext string) string {
switch strings.ToLower(ext) {
case ".html":
return "text/html"
case ".css":
return "text/css"
case ".js":
return "application/javascript"
case ".json":
return "application/json"
case ".png":
return "image/png"
case ".jpg", ".jpeg":
return "image/jpeg"
case ".svg":
return "image/svg+xml"
default:
return ""
}
}
108 changes: 108 additions & 0 deletions server/v2/api/swagger/server.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
package swagger

import (
"context"
"fmt"
"net/http"

"cosmossdk.io/core/server"
"cosmossdk.io/core/transaction"
"cosmossdk.io/log"
serverv2 "cosmossdk.io/server/v2"
)

var (
_ serverv2.ServerComponent[transaction.Tx] = (*Server[transaction.Tx])(nil)
_ serverv2.HasConfig = (*Server[transaction.Tx])(nil)
)

// Server represents a Swagger UI server
type Server[T transaction.Tx] struct {
logger log.Logger
config *Config
cfgOptions []CfgOption
server *http.Server
}

// New creates a new Swagger UI server
func New[T transaction.Tx](
logger log.Logger,
cfg server.ConfigMap,
cfgOptions ...CfgOption,
) (*Server[T], error) {
srv := &Server[T]{
logger: logger.With(log.ModuleKey, ServerName),
cfgOptions: cfgOptions,
}

serverCfg := srv.Config().(*Config)
if len(cfg) > 0 {
if err := serverv2.UnmarshalSubConfig(cfg, srv.Name(), &serverCfg); err != nil {
return nil, fmt.Errorf("failed to unmarshal config: %w", err)
}
}
srv.config = serverCfg

if err := srv.config.Validate(); err != nil {
return nil, err
}

mux := http.NewServeMux()
mux.Handle(srv.config.Path, Handler())

srv.server = &http.Server{
Addr: srv.config.Address,
Handler: mux,
}

return srv, nil
}

// NewWithConfigOptions creates a new server with configuration options
func NewWithConfigOptions[T transaction.Tx](opts ...CfgOption) *Server[T] {
return &Server[T]{
cfgOptions: opts,
}
}

// Name returns the server's name
func (s *Server[T]) Name() string {
return ServerName
}

// Config returns the server configuration
func (s *Server[T]) Config() any {
if s.config == nil || s.config.Address == "" {
cfg := DefaultConfig()
for _, opt := range s.cfgOptions {
opt(cfg)
}
return cfg
}
return s.config
}

// Start starts the server
func (s *Server[T]) Start(ctx context.Context) error {
if !s.config.Enable {
s.logger.Info(fmt.Sprintf("%s server is disabled via config", s.Name()))
return nil
}

s.logger.Info("starting swagger server...", "address", s.config.Address)
if err := s.server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
return fmt.Errorf("failed to start swagger server: %w", err)
}

return nil
}

// Stop stops the server
func (s *Server[T]) Stop(ctx context.Context) error {
if !s.config.Enable {
return nil
}

s.logger.Info("stopping swagger server...", "address", s.config.Address)
return s.server.Shutdown(ctx)
}
Loading