⏪ Revert "🚧 Trying to setup redirect middleware for Telegram IV"
/ docker (push) Successful in 1m4s
Details
/ docker (push) Successful in 1m4s
Details
This reverts commit 0558cf72d2
.
This commit is contained in:
parent
07fdaa0a9e
commit
f23188e99e
201
main.go
201
main.go
|
@ -13,10 +13,8 @@ import (
|
||||||
"log"
|
"log"
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"path"
|
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
"runtime/pprof"
|
"runtime/pprof"
|
||||||
|
@ -30,7 +28,6 @@ import (
|
||||||
|
|
||||||
"source.toby3d.me/toby3d/home/internal/common"
|
"source.toby3d.me/toby3d/home/internal/common"
|
||||||
"source.toby3d.me/toby3d/home/internal/domain"
|
"source.toby3d.me/toby3d/home/internal/domain"
|
||||||
"source.toby3d.me/toby3d/home/internal/middleware"
|
|
||||||
"source.toby3d.me/toby3d/home/internal/page"
|
"source.toby3d.me/toby3d/home/internal/page"
|
||||||
pagefsrepo "source.toby3d.me/toby3d/home/internal/page/repository/fs"
|
pagefsrepo "source.toby3d.me/toby3d/home/internal/page/repository/fs"
|
||||||
pageucase "source.toby3d.me/toby3d/home/internal/page/usecase"
|
pageucase "source.toby3d.me/toby3d/home/internal/page/usecase"
|
||||||
|
@ -83,151 +80,117 @@ func NewApp(ctx context.Context, config *domain.Config) (*App, error) {
|
||||||
pages := pagefsrepo.NewFileSystemPageRepository(contentDir)
|
pages := pagefsrepo.NewFileSystemPageRepository(contentDir)
|
||||||
pager := pageucase.NewPageUseCase(pages, resources)
|
pager := pageucase.NewPageUseCase(pages, resources)
|
||||||
|
|
||||||
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
server := &http.Server{
|
||||||
// TODO(toby3d): use exists static use case or split that on static and resource modules?
|
Addr: config.AddrPort().String(),
|
||||||
// INFO(toby3d): any static file is public and unprotected by design, so it's safe to search it first
|
Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
// before deep down to any page or it's resource which might be secured by middleware or something else.
|
// TODO(toby3d): use exists static use case or split that on static and resource modules?
|
||||||
static, err := statics.Get(r.Context(), strings.TrimPrefix(r.URL.Path, "/"))
|
// INFO(toby3d): any static file is public and unprotected by design, so it's safe to search it
|
||||||
if err == nil {
|
// first before deep down to any page or it's resource which might be secured by middleware or
|
||||||
http.ServeContent(w, r, static.Name(), domain.ResourceModTime(static), static)
|
// something else.
|
||||||
|
static, err := statics.Get(r.Context(), strings.TrimPrefix(r.URL.Path, "/"))
|
||||||
return
|
if err == nil {
|
||||||
}
|
http.ServeContent(w, r, static.Name(), domain.ResourceModTime(static), static)
|
||||||
|
|
||||||
lang := domain.LanguageUnd
|
|
||||||
|
|
||||||
s, err := siter.Do(r.Context(), lang)
|
|
||||||
if err != nil {
|
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if s.IsMultiLingual() {
|
|
||||||
head, tail := urlutil.ShiftPath(r.URL.Path)
|
|
||||||
|
|
||||||
if head == "" {
|
|
||||||
supported := make([]language.Tag, len(s.Languages))
|
|
||||||
for i := range s.Languages {
|
|
||||||
supported[i] = language.Make(s.Languages[i].Lang())
|
|
||||||
}
|
|
||||||
|
|
||||||
if s.DefaultLanguage != domain.LanguageUnd {
|
|
||||||
supported = append(
|
|
||||||
[]language.Tag{language.Make(s.DefaultLanguage.Code())},
|
|
||||||
supported...,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
requested, _, err := language.ParseAcceptLanguage(
|
|
||||||
r.Header.Get(common.HeaderAcceptLanguage))
|
|
||||||
if err != nil || len(requested) == 0 {
|
|
||||||
requested = append(requested, language.English)
|
|
||||||
}
|
|
||||||
|
|
||||||
matched, _, _ := language.NewMatcher(supported).Match(requested...)
|
|
||||||
lang = domain.NewLanguage(matched.String())
|
|
||||||
|
|
||||||
http.Redirect(w, r, "/"+lang.Lang()+"/", http.StatusSeeOther)
|
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
lang = domain.NewLanguage(head)
|
lang := domain.LanguageUnd
|
||||||
r.URL.Path = tail
|
|
||||||
}
|
|
||||||
|
|
||||||
if s, err = siter.Do(r.Context(), lang); err != nil {
|
s, err := siter.Do(r.Context(), lang)
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
if err != nil {
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
p, err := pager.Do(r.Context(), lang, r.URL.Path)
|
|
||||||
if err != nil {
|
|
||||||
if !errors.Is(err, page.ErrNotExist) {
|
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
res, err := resourcer.Do(r.Context(), r.URL.Path)
|
if s.IsMultiLingual() {
|
||||||
if err != nil {
|
head, tail := urlutil.ShiftPath(r.URL.Path)
|
||||||
if errors.Is(err, fs.ErrNotExist) {
|
|
||||||
http.Error(w, err.Error(), http.StatusNotFound)
|
if head == "" {
|
||||||
|
supported := make([]language.Tag, len(s.Languages))
|
||||||
|
for i := range s.Languages {
|
||||||
|
supported[i] = language.Make(s.Languages[i].Lang())
|
||||||
|
}
|
||||||
|
|
||||||
|
if s.DefaultLanguage != domain.LanguageUnd {
|
||||||
|
supported = append(
|
||||||
|
[]language.Tag{language.Make(s.DefaultLanguage.Code())},
|
||||||
|
supported...,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
requested, _, err := language.ParseAcceptLanguage(
|
||||||
|
r.Header.Get(common.HeaderAcceptLanguage))
|
||||||
|
if err != nil || len(requested) == 0 {
|
||||||
|
requested = append(requested, language.English)
|
||||||
|
}
|
||||||
|
|
||||||
|
matched, _, _ := language.NewMatcher(supported).Match(requested...)
|
||||||
|
lang = domain.NewLanguage(matched.String())
|
||||||
|
|
||||||
|
http.Redirect(w, r, "/"+lang.Lang()+"/", http.StatusSeeOther)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
lang = domain.NewLanguage(head)
|
||||||
|
r.URL.Path = tail
|
||||||
|
}
|
||||||
|
|
||||||
|
if s, err = siter.Do(r.Context(), lang); err != nil {
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
http.ServeContent(w, r, res.Name(), domain.ResourceModTime(res), res)
|
p, err := pager.Do(r.Context(), lang, r.URL.Path)
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
contentLanguage := make([]string, len(p.Translations))
|
|
||||||
for i := range p.Translations {
|
|
||||||
contentLanguage[i] = p.Translations[i].Language.Code()
|
|
||||||
}
|
|
||||||
|
|
||||||
w.Header().Set(common.HeaderContentLanguage, strings.Join(contentLanguage, ", "))
|
|
||||||
|
|
||||||
tpl, err := themer.Do(r.Context())
|
|
||||||
if err != nil {
|
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
w.Header().Set(common.HeaderContentType, common.MIMETextHTMLCharsetUTF8)
|
|
||||||
if err = tpl.Execute(w, &Context{
|
|
||||||
Site: s,
|
|
||||||
Page: p,
|
|
||||||
}); err != nil {
|
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
mw := middleware.Chain{
|
|
||||||
middleware.Redirect(middleware.RedirectConfig{
|
|
||||||
Code: http.StatusSeeOther,
|
|
||||||
Skipper: func(r *http.Request) bool {
|
|
||||||
return r.UserAgent() != "TelegramBot (like TwitterBot)"
|
|
||||||
},
|
|
||||||
}, func(u *url.URL) (string, bool) {
|
|
||||||
s, err := siter.Do(ctx, domain.LanguageUnd)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", false
|
if !errors.Is(err, page.ErrNotExist) {
|
||||||
}
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
|
||||||
if ivHash, ok := s.Params["instantViewHash"].(string); ok {
|
return
|
||||||
target := &url.URL{
|
|
||||||
Scheme: "https",
|
|
||||||
Host: "t.me",
|
|
||||||
Path: path.Join("/share", "url"),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
q := target.Query()
|
res, err := resourcer.Do(r.Context(), r.URL.Path)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, fs.ErrNotExist) {
|
||||||
|
http.Error(w, err.Error(), http.StatusNotFound)
|
||||||
|
|
||||||
q.Set("url", u.String())
|
return
|
||||||
q.Set("hash", ivHash)
|
}
|
||||||
|
|
||||||
target.RawQuery = q.Encode()
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
|
||||||
return target.String(), ok
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
http.ServeContent(w, r, res.Name(), domain.ResourceModTime(res), res)
|
||||||
|
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
return "", false
|
contentLanguage := make([]string, len(p.Translations))
|
||||||
}),
|
for i := range p.Translations {
|
||||||
}
|
contentLanguage[i] = p.Translations[i].Language.Code()
|
||||||
|
}
|
||||||
|
|
||||||
server := &http.Server{
|
w.Header().Set(common.HeaderContentLanguage, strings.Join(contentLanguage, ", "))
|
||||||
Addr: config.AddrPort().String(),
|
|
||||||
Handler: mw.Handler(handler),
|
tpl, err := themer.Do(r.Context())
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Set(common.HeaderContentType, common.MIMETextHTMLCharsetUTF8)
|
||||||
|
if err = tpl.Execute(w, &Context{
|
||||||
|
Site: s,
|
||||||
|
Page: p,
|
||||||
|
}); err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
}
|
||||||
|
}),
|
||||||
ErrorLog: logger,
|
ErrorLog: logger,
|
||||||
BaseContext: func(ln net.Listener) context.Context { return ctx },
|
BaseContext: func(ln net.Listener) context.Context { return ctx },
|
||||||
WriteTimeout: 500 * time.Millisecond,
|
WriteTimeout: 500 * time.Millisecond,
|
||||||
|
|
Loading…
Reference in New Issue