Skip to content

Fix linting errors: error handling, constants, and code quality #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CangioUni merged 1 commit into from
Nov 20, 2025
Merged

Fix linting errors: error handling, constants, and code quality #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
248 changes: 100 additions & 148 deletions geoblock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
"time"
)

const (
// CountryUnknown represents an unknown country code
CountryUnknown = "UNKNOWN"
// DefaultActionAllow represents the default allow action
DefaultActionAllow = "allow"
)

// Config holds the plugin configuration
type Config struct {
AllowedCountries []string `json:"allowedCountries,omitempty"`
Expand Down Expand Up @@ -49,7 +56,7 @@
DatabaseURL: "",
DatabasePath: "/tmp/ipinfo_lite.json",
CacheDuration: 60,
DefaultAction: "allow",
DefaultAction: DefaultActionAllow,
BlockMessage: "Access denied from your country",
BlockPageTitle: "Access Denied",
BlockPageBody: "",
Expand Down Expand Up @@ -159,12 +166,6 @@
counters map[string]int64 // key: "country|organization|action"
}

type prometheusMetricKey struct {
Country string
Organization string
Action string
}

// New creates a new GeoBlock plugin
func New(ctx context.Context, next http.Handler, config *Config, name string) (http.Handler, error) {
if config.QueryURL == "" {
Expand All @@ -179,8 +180,8 @@
config.CacheDuration = 60
}

if config.DefaultAction != "allow" && config.DefaultAction != "block" {
config.DefaultAction = "allow"
if config.DefaultAction != DefaultActionAllow && config.DefaultAction != "block" {

Check failure on line 183 in geoblock.go

View workflow job for this annotation

GitHub Actions / Lint 

string `block` has 3 occurrences, make it a constant (goconst)

Check failure on line 183 in geoblock.go

View workflow job for this annotation

GitHub Actions / Lint 

string `block` has 3 occurrences, make it a constant (goconst)
config.DefaultAction = DefaultActionAllow
}

if config.BlockMessage == "" {
Expand Down Expand Up @@ -269,7 +270,7 @@
func (g *GeoBlock) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
// Check if this is a Prometheus metrics request
if g.config.PrometheusMetricsPath != "" && req.URL.Path == g.config.PrometheusMetricsPath {
g.servePrometheusMetrics(rw, req)
g.servePrometheusMetrics(rw)
return
}

Expand All @@ -286,8 +287,8 @@
}
// On error, apply default action
if g.config.DefaultAction == "block" {
g.blockRequest(rw, "UNKNOWN", "")
g.recordMetrics("UNKNOWN", "", "blocked")
g.blockRequest(rw, CountryUnknown, "")
g.recordMetrics(CountryUnknown, "", "blocked")
return
}
g.next.ServeHTTP(rw, req)
Expand Down Expand Up @@ -354,7 +355,7 @@
// Use local database if available
if g.localDB != nil && len(g.localDB.ranges) > 0 {
country := g.lookupLocalDatabase(ip)
if country != "" && country != "UNKNOWN" {
if country != "" && country != CountryUnknown {
info = &geoInfo{Country: country, Organization: ""}
// Try to get organization from API
if apiInfo, apiErr := g.queryGeoIP(ip); apiErr == nil {
Expand Down Expand Up @@ -415,7 +416,7 @@
if g.config.LogBlocked {
fmt.Printf("[GeoBlock] Warning: Could not extract country from API response. Raw response: %s\n", string(body))
}
return &geoInfo{Country: "UNKNOWN", Organization: ""}, nil
return &geoInfo{Country: CountryUnknown, Organization: ""}, nil
}

// Extract organization information
Expand Down Expand Up @@ -512,70 +513,21 @@

// If custom body is provided, use it
if body != "" {
return fmt.Sprintf(`<!DOCTYPE html>
return g.generateCustomBlockPage(title, message, body, country)
}

// Default block page
return g.generateDefaultBlockPage(title, message, country)
}

func (g *GeoBlock) generateCustomBlockPage(title, message, body, country string) string {
return fmt.Sprintf(`<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>%s</title>
<style>
* { margin: 0; padding: 0; box-sizing: border-box; }
body {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
background: linear-gradient(135deg, #667eea 0%%, #764ba2 100%%);
min-height: 100vh;
display: flex;
align-items: center;
justify-content: center;
padding: 20px;
}
.container {
background: white;
border-radius: 16px;
box-shadow: 0 20px 60px rgba(0, 0, 0, 0.3);
max-width: 600px;
width: 100%%;
padding: 40px;
text-align: center;
}
.icon {
font-size: 64px;
margin-bottom: 20px;
}
h1 {
color: #2d3748;
font-size: 28px;
margin-bottom: 16px;
font-weight: 600;
}
.message {
color: #4a5568;
font-size: 16px;
line-height: 1.6;
margin-bottom: 24px;
}
.custom-body {
color: #718096;
font-size: 14px;
line-height: 1.8;
margin-top: 20px;
padding-top: 20px;
border-top: 1px solid #e2e8f0;
}
.country-info {
background: #f7fafc;
border-radius: 8px;
padding: 12px 16px;
display: inline-block;
color: #4a5568;
font-size: 14px;
margin-top: 20px;
}
.country-code {
font-weight: 600;
color: #667eea;
}
</style>
<style>%s</style>
</head>
<body>
<div class="container">
Expand All @@ -588,21 +540,67 @@
</div>
</div>
</body>
</html>`, title, title, message, body, country)
}
</html>`, title, getCustomBlockPageStyles(), title, message, body, country)
}

// Default block page
func (g *GeoBlock) generateDefaultBlockPage(title, message, country string) string {
return fmt.Sprintf(`<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>%s</title>
<style>
* { margin: 0; padding: 0; box-sizing: border-box; }
<style>%s</style>
</head>
<body>
<div class="container">
<div class="icon">🚫</div>
<h1>%s</h1>
<div class="message">%s</div>
<div class="country-info">
Detected Country: <span class="country-code">%s</span>
</div>
<div class="footer">
If you believe this is an error, please contact the website administrator.
</div>
</div>
</body>
</html>`, title, getDefaultBlockPageStyles(), title, message, country)
}

func getCustomBlockPageStyles() string {
return `* { margin: 0; padding: 0; box-sizing: border-box; }
body {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
min-height: 100vh;
display: flex;
align-items: center;
justify-content: center;
padding: 20px;
}
.container {
background: white;
border-radius: 16px;
box-shadow: 0 20px 60px rgba(0, 0, 0, 0.3);
max-width: 600px;
width: 100%;
padding: 40px;
text-align: center;
}
.icon { font-size: 64px; margin-bottom: 20px; }
h1 { color: #2d3748; font-size: 28px; margin-bottom: 16px; font-weight: 600; }
.message { color: #4a5568; font-size: 16px; line-height: 1.6; margin-bottom: 24px; }
.custom-body { color: #718096; font-size: 14px; line-height: 1.8; margin-top: 20px; padding-top: 20px; border-top: 1px solid #e2e8f0; }
.country-info { background: #f7fafc; border-radius: 8px; padding: 12px 16px; display: inline-block; color: #4a5568; font-size: 14px; margin-top: 20px; }
.country-code { font-weight: 600; color: #667eea; }`
}

func getDefaultBlockPageStyles() string {
return `* { margin: 0; padding: 0; box-sizing: border-box; }
body {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
background: linear-gradient(135deg, #667eea 0%%, #764ba2 100%%);
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
min-height: 100vh;
display: flex;
align-items: center;
Expand All @@ -614,77 +612,25 @@
border-radius: 16px;
box-shadow: 0 20px 60px rgba(0, 0, 0, 0.3);
max-width: 500px;
width: 100%%;
width: 100%;
padding: 40px;
text-align: center;
animation: slideIn 0.3s ease-out;
}
@keyframes slideIn {
from {
opacity: 0;
transform: translateY(-20px);
}
to {
opacity: 1;
transform: translateY(0);
}
}
.icon {
font-size: 64px;
margin-bottom: 20px;
animation: pulse 2s infinite;
from { opacity: 0; transform: translateY(-20px); }
to { opacity: 1; transform: translateY(0); }
}
.icon { font-size: 64px; margin-bottom: 20px; animation: pulse 2s infinite; }
@keyframes pulse {
0%%, 100%% { transform: scale(1); }
50%% { transform: scale(1.05); }
}
h1 {
color: #2d3748;
font-size: 28px;
margin-bottom: 16px;
font-weight: 600;
}
.message {
color: #4a5568;
font-size: 16px;
line-height: 1.6;
margin-bottom: 24px;
}
.country-info {
background: #f7fafc;
border-radius: 8px;
padding: 12px 16px;
display: inline-block;
color: #4a5568;
font-size: 14px;
}
.country-code {
font-weight: 600;
color: #667eea;
}
.footer {
margin-top: 30px;
padding-top: 20px;
border-top: 1px solid #e2e8f0;
color: #a0aec0;
font-size: 12px;
0%, 100% { transform: scale(1); }
50% { transform: scale(1.05); }
}
</style>
</head>
<body>
<div class="container">
<div class="icon">🚫</div>
<h1>%s</h1>
<div class="message">%s</div>
<div class="country-info">
Detected Country: <span class="country-code">%s</span>
</div>
<div class="footer">
If you believe this is an error, please contact the website administrator.
</div>
</div>
</body>
</html>`, title, title, message, country)
h1 { color: #2d3748; font-size: 28px; margin-bottom: 16px; font-weight: 600; }
.message { color: #4a5568; font-size: 16px; line-height: 1.6; margin-bottom: 24px; }
.country-info { background: #f7fafc; border-radius: 8px; padding: 12px 16px; display: inline-block; color: #4a5568; font-size: 14px; }
.country-code { font-weight: 600; color: #667eea; }
.footer { margin-top: 30px; padding-top: 20px; border-top: 1px solid #e2e8f0; color: #a0aec0; font-size: 12px; }`
}


Expand Down Expand Up @@ -772,7 +718,9 @@
}

// Reopen for reading
tmpFile.Seek(0, 0)
if _, err := tmpFile.Seek(0, 0); err != nil {
return fmt.Errorf("failed to seek temp file: %w", err)
}

// Decompress gzip
gzReader, err := gzip.NewReader(tmpFile)
Expand Down Expand Up @@ -841,7 +789,7 @@
func (g *GeoBlock) lookupLocalDatabase(ip string) string {
parsedIP := net.ParseIP(ip)
if parsedIP == nil {
return "UNKNOWN"
return CountryUnknown
}

g.localDB.mu.RLock()
Expand All @@ -855,7 +803,7 @@
}
}

return "UNKNOWN"
return CountryUnknown
}

func ipInRange(ip, start, end net.IP) bool {
Expand Down Expand Up @@ -1015,7 +963,9 @@

// Sync to disk
if ma.logFile != nil {
ma.logFile.Sync()
if err := ma.logFile.Sync(); err != nil {
fmt.Printf("[GeoBlock] Error syncing log file: %v\n", err)
}
}
}

Expand Down Expand Up @@ -1082,7 +1032,7 @@
pm.counters[key]++
}

func (g *GeoBlock) servePrometheusMetrics(rw http.ResponseWriter, req *http.Request) {
func (g *GeoBlock) servePrometheusMetrics(rw http.ResponseWriter) {
if g.promMetrics == nil {
http.Error(rw, "Metrics not enabled", http.StatusNotFound)
return
Expand All @@ -1092,7 +1042,9 @@

rw.Header().Set("Content-Type", "text/plain; version=0.0.4; charset=utf-8")
rw.WriteHeader(http.StatusOK)
rw.Write([]byte(metrics))
if _, err := rw.Write([]byte(metrics)); err != nil {
fmt.Printf("[GeoBlock] Error writing metrics response: %v\n", err)
}
}

func (pm *prometheusMetrics) render() string {
Expand Down
Loading