Added custom headers option
This commit is contained in:
@@ -2,6 +2,7 @@ package handlers
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
|
"path"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"quay/internal/config"
|
"quay/internal/config"
|
||||||
|
|
||||||
@@ -21,6 +22,20 @@ func NewStaticHandler(storagePath string, siteMap map[string]config.SiteConfig)
|
|||||||
|
|
||||||
urlPath := filepath.Clean(c.Path())
|
urlPath := filepath.Clean(c.Path())
|
||||||
|
|
||||||
|
for _, header := range site.CustomHeaders {
|
||||||
|
var matched bool
|
||||||
|
if header.Regex && header.Compiled != nil {
|
||||||
|
matched = header.Compiled.MatchString(urlPath)
|
||||||
|
} else {
|
||||||
|
matched, _ = path.Match(header.Source, urlPath)
|
||||||
|
}
|
||||||
|
if matched {
|
||||||
|
for key, value := range header.Headers {
|
||||||
|
c.Set(key, value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for _, rule := range site.ForwardRules {
|
for _, rule := range site.ForwardRules {
|
||||||
if rule.Regex && rule.Compiled != nil {
|
if rule.Regex && rule.Compiled != nil {
|
||||||
match := rule.Compiled.FindStringSubmatchIndex(urlPath)
|
match := rule.Compiled.FindStringSubmatchIndex(urlPath)
|
||||||
|
|||||||
+10
-2
@@ -9,20 +9,28 @@ sites:
|
|||||||
domain: docs.my-lib.com
|
domain: docs.my-lib.com
|
||||||
deploy_token: "${MY_LIB_DEPLOY_TOKEN}"
|
deploy_token: "${MY_LIB_DEPLOY_TOKEN}"
|
||||||
enabled: true
|
enabled: true
|
||||||
|
not_found_file: 404.html
|
||||||
forward_rules:
|
forward_rules:
|
||||||
- source: /npm
|
- source: /npm
|
||||||
destination: https://www.npmjs.com/package/my-lib
|
destination: https://www.npmjs.com/package/my-lib
|
||||||
status_code: 302
|
status_code: 302
|
||||||
|
|
||||||
- source: ^/docs/v(\d+)$
|
- source: ^/docs/v(\d+)$
|
||||||
destination: https://v$1.docs.my-lib.com/
|
destination: https://v$1.docs.my-lib.com/
|
||||||
status_code: 301
|
status_code: 301
|
||||||
regex: true
|
regex: true
|
||||||
|
|
||||||
- source: ^/blog/(?P<slug>[^/]+)$
|
- source: ^/blog/(?P<slug>[^/]+)$
|
||||||
destination: /posts/${slug}
|
destination: /posts/${slug}
|
||||||
status_code: 302
|
status_code: 302
|
||||||
regex: true
|
regex: true
|
||||||
|
custom_headers:
|
||||||
|
- source: /json/* # glob (default)
|
||||||
|
headers:
|
||||||
|
Content-Type: "application/json"
|
||||||
|
Cache-Control: "max-age=7200, must-revalidate"
|
||||||
|
- source: ^/api/v\d+/ # regex opt-in
|
||||||
|
regex: true
|
||||||
|
headers:
|
||||||
|
Cache-Control: "no-store"
|
||||||
|
|
||||||
- repo: portfolio
|
- repo: portfolio
|
||||||
owner: yourname
|
owner: yourname
|
||||||
|
|||||||
+44
-10
@@ -3,6 +3,7 @@ package config
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
"path"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
@@ -17,17 +18,25 @@ type ForwardRule struct {
|
|||||||
Compiled *regexp.Regexp
|
Compiled *regexp.Regexp
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type CustomHeader struct {
|
||||||
|
Source string `yaml:"source"`
|
||||||
|
Regex bool `yaml:"regex"`
|
||||||
|
Headers map[string]string `yaml:"headers"`
|
||||||
|
Compiled *regexp.Regexp
|
||||||
|
}
|
||||||
|
|
||||||
type SiteConfig struct {
|
type SiteConfig struct {
|
||||||
Name string `yaml:"name"`
|
Name string `yaml:"name"`
|
||||||
Repo string `yaml:"repo"`
|
Repo string `yaml:"repo"`
|
||||||
Owner string `yaml:"owner"`
|
Owner string `yaml:"owner"`
|
||||||
Branch string `yaml:"branch"`
|
Branch string `yaml:"branch"`
|
||||||
Domain string `yaml:"domain"`
|
Domain string `yaml:"domain"`
|
||||||
Enabled bool `yaml:"enabled"`
|
Enabled bool `yaml:"enabled"`
|
||||||
SPA bool `yaml:"spa"`
|
SPA bool `yaml:"spa"`
|
||||||
NotFoundFile string `yaml:"not_found_file"`
|
NotFoundFile string `yaml:"not_found_file"`
|
||||||
DeployToken string `yaml:"deploy_token"`
|
DeployToken string `yaml:"deploy_token"`
|
||||||
ForwardRules []ForwardRule `yaml:"forward_rules"`
|
ForwardRules []ForwardRule `yaml:"forward_rules"`
|
||||||
|
CustomHeaders []CustomHeader `yaml:"custom_headers"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type Config struct {
|
type Config struct {
|
||||||
@@ -84,6 +93,31 @@ func validateConfig(config *Config) error {
|
|||||||
config.Sites[i].ForwardRules[j].Compiled = re
|
config.Sites[i].ForwardRules[j].Compiled = re
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
for k, header := range site.CustomHeaders {
|
||||||
|
if header.Source == "" {
|
||||||
|
return &Error{Field: fmt.Sprintf("sites[%d].custom_headers[%d].source", i, k), Message: "Source is required"}
|
||||||
|
}
|
||||||
|
if len(header.Headers) == 0 {
|
||||||
|
return &Error{Field: fmt.Sprintf("sites[%d].custom_headers[%d].headers", i, k), Message: "At least one header is required"}
|
||||||
|
}
|
||||||
|
if header.Regex {
|
||||||
|
re, err := regexp.Compile(header.Source)
|
||||||
|
if err != nil {
|
||||||
|
return &Error{
|
||||||
|
Field: fmt.Sprintf("sites[%d].custom_headers[%d].source", i, k),
|
||||||
|
Message: "Invalid regex: " + err.Error(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
config.Sites[i].CustomHeaders[k].Compiled = re
|
||||||
|
} else {
|
||||||
|
if _, err := path.Match(header.Source, ""); err != nil {
|
||||||
|
return &Error{
|
||||||
|
Field: fmt.Sprintf("sites[%d].custom_headers[%d].source", i, k),
|
||||||
|
Message: "Invalid glob pattern: " + err.Error(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user