heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: refactor controllers and use standard library (#385)

Browse Source
This commit is contained in:
Senan Kelly
2023-09-30 22:40:51 +01:00
committed by GitHub
parent adceff1267
commit e9accfb71f
25 changed files with 889 additions and 929 deletions
Download Patch File Download Diff File Expand all files Collapse all files

414
server/ctrladmin/ctrl.go
View File

@@ -1,6 +1,8 @@
package ctrladmin
import (
"context"
"embed"
"encoding/base64"
"encoding/gob"
"encoding/json"
@@ -22,10 +24,11 @@ import (
"go.senan.xyz/gonic"
"go.senan.xyz/gonic/db"
"go.senan.xyz/gonic/handlerutil"
"go.senan.xyz/gonic/lastfm"
"go.senan.xyz/gonic/podcasts"
"go.senan.xyz/gonic/scanner"
"go.senan.xyz/gonic/server/ctrladmin/adminui"
"go.senan.xyz/gonic/server/ctrlbase"
)
type CtxKey int
@@ -35,6 +38,263 @@ const (
CtxSession
)
type Controller struct {
*http.ServeMux
dbc *db.DB
sessDB *gormstore.Store
scanner *scanner.Scanner
podcasts *podcasts.Podcasts
lastfmClient *lastfm.Client
resolveProxyPath ProxyPathResolver
}
type ProxyPathResolver func(in string) string
func New(dbc *db.DB, sessDB *gormstore.Store, scanner *scanner.Scanner, podcasts *podcasts.Podcasts, lastfmClient *lastfm.Client, resolveProxyPath ProxyPathResolver) (*Controller, error) {
c := Controller{
ServeMux: http.NewServeMux(),
dbc: dbc,
sessDB: sessDB,
scanner: scanner,
podcasts: podcasts,
lastfmClient: lastfmClient,
resolveProxyPath: resolveProxyPath,
}
resp := respHandler(adminui.TemplatesFS, resolveProxyPath)
baseChain := withSession(sessDB)
userChain := handlerutil.Chain(
baseChain,
withUserSession(dbc, resolveProxyPath),
)
adminChain := handlerutil.Chain(
userChain,
withAdminSession,
)
c.Handle("/static/", http.FileServer(http.FS(adminui.StaticFS)))
// public routes (creates session)
c.Handle("/login", baseChain(resp(c.ServeLogin)))
c.Handle("/login_do", baseChain(respRaw(c.ServeLoginDo)))
// user routes (if session is valid)
c.Handle("/logout", userChain(respRaw(c.ServeLogout)))
c.Handle("/home", userChain(resp(c.ServeHome)))
c.Handle("/change_username", userChain(resp(c.ServeChangeUsername)))
c.Handle("/change_username_do", userChain(resp(c.ServeChangeUsernameDo)))
c.Handle("/change_password", userChain(resp(c.ServeChangePassword)))
c.Handle("/change_password_do", userChain(resp(c.ServeChangePasswordDo)))
c.Handle("/change_avatar", userChain(resp(c.ServeChangeAvatar)))
c.Handle("/change_avatar_do", userChain(resp(c.ServeChangeAvatarDo)))
c.Handle("/delete_avatar_do", userChain(resp(c.ServeDeleteAvatarDo)))
c.Handle("/delete_user", userChain(resp(c.ServeDeleteUser)))
c.Handle("/delete_user_do", userChain(resp(c.ServeDeleteUserDo)))
c.Handle("/link_lastfm_do", userChain(resp(c.ServeLinkLastFMDo)))
c.Handle("/unlink_lastfm_do", userChain(resp(c.ServeUnlinkLastFMDo)))
c.Handle("/link_listenbrainz_do", userChain(resp(c.ServeLinkListenBrainzDo)))
c.Handle("/unlink_listenbrainz_do", userChain(resp(c.ServeUnlinkListenBrainzDo)))
c.Handle("/create_transcode_pref_do", userChain(resp(c.ServeCreateTranscodePrefDo)))
c.Handle("/delete_transcode_pref_do", userChain(resp(c.ServeDeleteTranscodePrefDo)))
// admin routes (if session is valid, and is admin)
c.Handle("/create_user", adminChain(resp(c.ServeCreateUser)))
c.Handle("/create_user_do", adminChain(resp(c.ServeCreateUserDo)))
c.Handle("/update_lastfm_api_key", adminChain(resp(c.ServeUpdateLastFMAPIKey)))
c.Handle("/update_lastfm_api_key_do", adminChain(resp(c.ServeUpdateLastFMAPIKeyDo)))
c.Handle("/start_scan_inc_do", adminChain(resp(c.ServeStartScanIncDo)))
c.Handle("/start_scan_full_do", adminChain(resp(c.ServeStartScanFullDo)))
c.Handle("/add_podcast_do", adminChain(resp(c.ServePodcastAddDo)))
c.Handle("/delete_podcast_do", adminChain(resp(c.ServePodcastDeleteDo)))
c.Handle("/download_podcast_do", adminChain(resp(c.ServePodcastDownloadDo)))
c.Handle("/update_podcast_do", adminChain(resp(c.ServePodcastUpdateDo)))
c.Handle("/add_internet_radio_station_do", adminChain(resp(c.ServeInternetRadioStationAddDo)))
c.Handle("/delete_internet_radio_station_do", adminChain(resp(c.ServeInternetRadioStationDeleteDo)))
c.Handle("/update_internet_radio_station_do", adminChain(resp(c.ServeInternetRadioStationUpdateDo)))
c.Handle("/", baseChain(resp(c.ServeNotFound)))
return &c, nil
}
func withSession(sessDB *gormstore.Store) handlerutil.Middleware {
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
session, err := sessDB.Get(r, gonic.Name)
if err != nil {
http.Error(w, fmt.Sprintf("error getting session: %s", err), 500)
return
}
withSession := context.WithValue(r.Context(), CtxSession, session)
next.ServeHTTP(w, r.WithContext(withSession))
})
}
}
func withUserSession(dbc *db.DB, resolvePath func(string) string) handlerutil.Middleware {
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// session exists at this point
session := r.Context().Value(CtxSession).(*sessions.Session)
userID, ok := session.Values["user"].(int)
if !ok {
sessAddFlashW(session, []string{"you are not authenticated"})
sessLogSave(session, w, r)
http.Redirect(w, r, resolvePath("/admin/login"), http.StatusSeeOther)
return
}
// take username from sesion and add the user row to the context
user := dbc.GetUserByID(userID)
if user == nil {
// the username in the client's session no longer relates to a
// user in the database (maybe the user was deleted)
session.Options.MaxAge = -1
sessLogSave(session, w, r)
http.Redirect(w, r, "/", http.StatusSeeOther)
return
}
withUser := context.WithValue(r.Context(), CtxUser, user)
next.ServeHTTP(w, r.WithContext(withUser))
})
}
}
func withAdminSession(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// session and user exist at this point
session := r.Context().Value(CtxSession).(*sessions.Session)
user := r.Context().Value(CtxUser).(*db.User)
if !user.IsAdmin {
sessAddFlashW(session, []string{"you are not an admin"})
sessLogSave(session, w, r)
http.Redirect(w, r, "/admin/login", http.StatusSeeOther)
return
}
next.ServeHTTP(w, r)
})
}
type Response struct {
// code is 200
template string
data *templateData
// code is 303
redirect string
flashN []string // normal
flashW []string // warning
// code is >= 400
code int
err string
}
type (
handlerAdmin func(r *http.Request) *Response
)
func respHandler(templateFS embed.FS, resolvePath func(string) string) func(next handlerAdmin) http.Handler {
tmpl := template.Must(template.
New("layout").
Funcs(template.FuncMap(sprig.FuncMap())).
Funcs(funcMap()).
Funcs(template.FuncMap{"path": resolvePath}).
ParseFS(templateFS, "*.tmpl", "**/*.tmpl"),
)
buffPool := bpool.NewBufferPool(64)
return func(next handlerAdmin) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
resp := next(r)
session, ok := r.Context().Value(CtxSession).(*sessions.Session)
if ok {
sessAddFlashN(session, resp.flashN)
sessAddFlashW(session, resp.flashW)
if err := session.Save(r, w); err != nil {
http.Error(w, fmt.Sprintf("error saving session: %v", err), 500)
return
}
}
if resp.redirect != "" {
http.Redirect(w, r, resolvePath(resp.redirect), http.StatusSeeOther)
return
}
if resp.err != "" {
http.Error(w, resp.err, resp.code)
return
}
if resp.template == "" {
http.Error(w, "useless handler return", 500)
return
}
if resp.data == nil {
resp.data = &templateData{}
}
resp.data.Version = gonic.Version
if session != nil {
resp.data.Flashes = session.Flashes()
if err := session.Save(r, w); err != nil {
http.Error(w, fmt.Sprintf("error saving session: %v", err), 500)
return
}
}
if user, ok := r.Context().Value(CtxUser).(*db.User); ok {
resp.data.User = user
}
buff := buffPool.Get()
defer buffPool.Put(buff)
if err := tmpl.ExecuteTemplate(buff, resp.template, resp.data); err != nil {
http.Error(w, fmt.Sprintf("executing template: %v", err), 500)
return
}
w.Header().Set("Content-Type", "text/html; charset=utf-8")
if resp.code != 0 {
w.WriteHeader(resp.code)
}
if _, err := buff.WriteTo(w); err != nil {
log.Printf("error writing to response buffer: %v\n", err)
}
})
}
}
func respRaw(h http.HandlerFunc) http.Handler {
return h // stub
}
type templateData struct {
// common
Flashes []interface{}
User *db.User
Version string
// home
AlbumCount int
ArtistCount int
TrackCount int
RequestRoot string
RecentFolders []*db.Album
AllUsers []*db.User
LastScanTime time.Time
IsScanning bool
TranscodePreferences []*db.TranscodePreference
TranscodeProfiles []string
CurrentLastFMAPIKey string
CurrentLastFMAPISecret string
DefaultListenBrainzURL string
SelectedUser *db.User
Podcasts []*db.Podcast
InternetRadioStations []*db.InternetRadioStation
// avatar
Avatar []byte
}
func funcMap() template.FuncMap {
return template.FuncMap{
"str": func(in any) string {
@@ -72,153 +332,7 @@ func funcMap() template.FuncMap {
}
}
type Controller struct {
*ctrlbase.Controller
buffPool *bpool.BufferPool
template *template.Template
sessDB *gormstore.Store
Podcasts *podcasts.Podcasts
lastfmClient *lastfm.Client
}
func New(b *ctrlbase.Controller, sessDB *gormstore.Store, podcasts *podcasts.Podcasts, lastfmClient *lastfm.Client) (*Controller, error) {
tmpl, err := template.
New("layout").
Funcs(template.FuncMap(sprig.FuncMap())).
Funcs(funcMap()). // static
Funcs(template.FuncMap{ // from base
"path": b.Path,
}).
ParseFS(adminui.TemplatesFS, "*.tmpl", "**/*.tmpl")
if err != nil {
return nil, fmt.Errorf("build template: %w", err)
}
return &Controller{
Controller: b,
buffPool: bpool.NewBufferPool(64),
template: tmpl,
sessDB: sessDB,
Podcasts: podcasts,
lastfmClient: lastfmClient,
}, nil
}
type templateData struct {
// common
Flashes []interface{}
User *db.User
Version string
// home
AlbumCount int
ArtistCount int
TrackCount int
RequestRoot string
RecentFolders []*db.Album
AllUsers []*db.User
LastScanTime time.Time
IsScanning bool
TranscodePreferences []*db.TranscodePreference
TranscodeProfiles []string
CurrentLastFMAPIKey string
CurrentLastFMAPISecret string
DefaultListenBrainzURL string
SelectedUser *db.User
Podcasts []*db.Podcast
InternetRadioStations []*db.InternetRadioStation
// avatar
Avatar []byte
}
type Response struct {
// code is 200
template string
data *templateData
// code is 303
redirect string
flashN []string // normal
flashW []string // warning
// code is >= 400
code int
err string
}
type (
handlerAdmin func(r *http.Request) *Response
handlerAdminRaw func(w http.ResponseWriter, r *http.Request)
)
func (c *Controller) H(h handlerAdmin) http.Handler {
// TODO: break this up a bit
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
resp := h(r)
session, ok := r.Context().Value(CtxSession).(*sessions.Session)
if ok {
sessAddFlashN(session, resp.flashN)
sessAddFlashW(session, resp.flashW)
if err := session.Save(r, w); err != nil {
http.Error(w, fmt.Sprintf("error saving session: %v", err), 500)
return
}
}
if resp.redirect != "" {
to := resp.redirect
if strings.HasPrefix(to, "/") {
to = c.Path(to)
}
http.Redirect(w, r, to, http.StatusSeeOther)
return
}
if resp.err != "" {
http.Error(w, resp.err, resp.code)
return
}
if resp.template == "" {
http.Error(w, "useless handler return", 500)
return
}
if resp.data == nil {
resp.data = &templateData{}
}
resp.data.Version = gonic.Version
if session != nil {
resp.data.Flashes = session.Flashes()
if err := session.Save(r, w); err != nil {
http.Error(w, fmt.Sprintf("error saving session: %v", err), 500)
return
}
}
if user, ok := r.Context().Value(CtxUser).(*db.User); ok {
resp.data.User = user
}
buff := c.buffPool.Get()
defer c.buffPool.Put(buff)
if err := c.template.ExecuteTemplate(buff, resp.template, resp.data); err != nil {
http.Error(w, fmt.Sprintf("executing template: %v", err), 500)
return
}
w.Header().Set("Content-Type", "text/html; charset=utf-8")
if resp.code != 0 {
w.WriteHeader(resp.code)
}
if _, err := buff.WriteTo(w); err != nil {
log.Printf("error writing to response buffer: %v\n", err)
}
})
}
func (c *Controller) HR(h handlerAdminRaw) http.Handler {
return http.HandlerFunc(h)
}
// ## begin utilities
// ## begin utilities
// ## begin utilities
// utilities
type FlashType string
@@ -268,9 +382,7 @@ func sessLogSave(s *sessions.Session, w http.ResponseWriter, r *http.Request) {
}
}
// ## begin validation
// ## begin validation
// ## begin validation
// validation
var (
errValiNoUsername = errors.New("please enter a username")

99
server/ctrladmin/handlers.go
View File

@@ -5,9 +5,7 @@ import (
"bytes"
"fmt"
"image"
_ "image/gif" // to decode uploaded GIF avatars
"image/jpeg"
_ "image/png" // to decode uploaded PNG avatars
"log"
"net/http"
"net/url"
@@ -19,19 +17,12 @@ import (
"github.com/nfnt/resize"
"go.senan.xyz/gonic/db"
"go.senan.xyz/gonic/handlerutil"
"go.senan.xyz/gonic/listenbrainz"
"go.senan.xyz/gonic/scanner"
"go.senan.xyz/gonic/transcode"
)
func doScan(scanner *scanner.Scanner, opts scanner.ScanOptions) {
go func() {
if _, err := scanner.ScanAndClean(opts); err != nil {
log.Printf("error while scanning: %v\n", err)
}
}()
}
func (c *Controller) ServeNotFound(_ *http.Request) *Response {
return &Response{template: "not_found.tmpl", code: 404}
}
@@ -45,35 +36,35 @@ func (c *Controller) ServeHome(r *http.Request) *Response {
data := &templateData{}
// stats box
c.DB.Model(&db.Artist{}).Count(&data.ArtistCount)
c.DB.Model(&db.Album{}).Count(&data.AlbumCount)
c.DB.Table("tracks").Count(&data.TrackCount)
c.dbc.Model(&db.Artist{}).Count(&data.ArtistCount)
c.dbc.Model(&db.Album{}).Count(&data.AlbumCount)
c.dbc.Table("tracks").Count(&data.TrackCount)
// lastfm box
data.RequestRoot = c.BaseURL(r)
data.CurrentLastFMAPIKey, _ = c.DB.GetSetting(db.LastFMAPIKey)
data.RequestRoot = handlerutil.BaseURL(r)
data.CurrentLastFMAPIKey, _ = c.dbc.GetSetting(db.LastFMAPIKey)
data.DefaultListenBrainzURL = listenbrainz.BaseURL
// users box
allUsersQ := c.DB.DB
allUsersQ := c.dbc.DB
if !user.IsAdmin {
allUsersQ = allUsersQ.Where("name=?", user.Name)
}
allUsersQ.Find(&data.AllUsers)
// recent folders box
c.DB.
c.dbc.
Order("created_at DESC").
Limit(10).
Find(&data.RecentFolders)
data.IsScanning = c.Scanner.IsScanning()
if tStr, _ := c.DB.GetSetting(db.LastScanTime); tStr != "" {
data.IsScanning = c.scanner.IsScanning()
if tStr, _ := c.dbc.GetSetting(db.LastScanTime); tStr != "" {
i, _ := strconv.ParseInt(tStr, 10, 64)
data.LastScanTime = time.Unix(i, 0)
}
// transcoding box
c.DB.
c.dbc.
Where("user_id=?", user.ID).
Find(&data.TranscodePreferences)
for profile := range transcode.UserProfiles {
@@ -81,10 +72,10 @@ func (c *Controller) ServeHome(r *http.Request) *Response {
}
sort.Strings(data.TranscodeProfiles)
// podcasts box
c.DB.Find(&data.Podcasts)
c.dbc.Find(&data.Podcasts)
// internet radio box
c.DB.Find(&data.InternetRadioStations)
c.dbc.Find(&data.InternetRadioStations)
return &Response{
template: "home.tmpl",
@@ -106,7 +97,7 @@ func (c *Controller) ServeLinkLastFMDo(r *http.Request) *Response {
}
user := r.Context().Value(CtxUser).(*db.User)
user.LastFMSession = sessionKey
if err := c.DB.Save(user).Error; err != nil {
if err := c.dbc.Save(user).Error; err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("save user: %v", err)}}
}
return &Response{redirect: "/admin/home"}
@@ -115,7 +106,7 @@ func (c *Controller) ServeLinkLastFMDo(r *http.Request) *Response {
func (c *Controller) ServeUnlinkLastFMDo(r *http.Request) *Response {
user := r.Context().Value(CtxUser).(*db.User)
user.LastFMSession = ""
if err := c.DB.Save(user).Error; err != nil {
if err := c.dbc.Save(user).Error; err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("save user: %v", err)}}
}
return &Response{redirect: "/admin/home"}
@@ -133,7 +124,7 @@ func (c *Controller) ServeLinkListenBrainzDo(r *http.Request) *Response {
user := r.Context().Value(CtxUser).(*db.User)
user.ListenBrainzURL = url
user.ListenBrainzToken = token
if err := c.DB.Save(user).Error; err != nil {
if err := c.dbc.Save(user).Error; err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("save user: %v", err)}}
}
return &Response{redirect: "/admin/home"}
@@ -143,7 +134,7 @@ func (c *Controller) ServeUnlinkListenBrainzDo(r *http.Request) *Response {
user := r.Context().Value(CtxUser).(*db.User)
user.ListenBrainzURL = ""
user.ListenBrainzToken = ""
if err := c.DB.Save(user).Error; err != nil {
if err := c.dbc.Save(user).Error; err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("save user: %v", err)}}
}
return &Response{redirect: "/admin/home"}
@@ -175,7 +166,7 @@ func (c *Controller) ServeChangeUsernameDo(r *http.Request) *Response {
}
}
user.Name = usernameNew
if err := c.DB.Save(user).Error; err != nil {
if err := c.dbc.Save(user).Error; err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("save username: %v", err)}}
}
return &Response{redirect: "/admin/home"}
@@ -208,7 +199,7 @@ func (c *Controller) ServeChangePasswordDo(r *http.Request) *Response {
}
}
user.Password = passwordOne
if err := c.DB.Save(user).Error; err != nil {
if err := c.dbc.Save(user).Error; err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("save user: %v", err)}}
}
return &Response{redirect: "/admin/home"}
@@ -240,7 +231,7 @@ func (c *Controller) ServeChangeAvatarDo(r *http.Request) *Response {
}
}
user.Avatar = avatar
if err := c.DB.Save(user).Error; err != nil {
if err := c.dbc.Save(user).Error; err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("save user: %v", err)}}
}
return &Response{
@@ -255,7 +246,7 @@ func (c *Controller) ServeDeleteAvatarDo(r *http.Request) *Response {
return &Response{code: 400, err: err.Error()}
}
user.Avatar = nil
if err := c.DB.Save(user).Error; err != nil {
if err := c.dbc.Save(user).Error; err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("save user: %v", err)}}
}
return &Response{
@@ -288,7 +279,7 @@ func (c *Controller) ServeDeleteUserDo(r *http.Request) *Response {
flashW: []string{"can't delete the admin user"},
}
}
if err := c.DB.Delete(user).Error; err != nil {
if err := c.dbc.Delete(user).Error; err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("delete user: %v", err)}}
}
return &Response{redirect: "/admin/home"}
@@ -318,7 +309,7 @@ func (c *Controller) ServeCreateUserDo(r *http.Request) *Response {
Name: username,
Password: passwordOne,
}
if err := c.DB.Create(&user).Error; err != nil {
if err := c.dbc.Create(&user).Error; err != nil {
return &Response{
redirect: r.Referer(),
flashW: []string{fmt.Sprintf("could not create user `%s`: %v", username, err)},
@@ -330,10 +321,10 @@ func (c *Controller) ServeCreateUserDo(r *http.Request) *Response {
func (c *Controller) ServeUpdateLastFMAPIKey(r *http.Request) *Response {
data := &templateData{}
var err error
if data.CurrentLastFMAPIKey, err = c.DB.GetSetting(db.LastFMAPIKey); err != nil {
if data.CurrentLastFMAPIKey, err = c.dbc.GetSetting(db.LastFMAPIKey); err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("couldn't get api key: %v", err)}}
}
if data.CurrentLastFMAPISecret, err = c.DB.GetSetting(db.LastFMSecret); err != nil {
if data.CurrentLastFMAPISecret, err = c.dbc.GetSetting(db.LastFMSecret); err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("couldn't get secret: %v", err)}}
}
return &Response{
@@ -351,17 +342,17 @@ func (c *Controller) ServeUpdateLastFMAPIKeyDo(r *http.Request) *Response {
flashW: []string{err.Error()},
}
}
if err := c.DB.SetSetting(db.LastFMAPIKey, apiKey); err != nil {
if err := c.dbc.SetSetting(db.LastFMAPIKey, apiKey); err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("couldn't set api key: %v", err)}}
}
if err := c.DB.SetSetting(db.LastFMSecret, secret); err != nil {
if err := c.dbc.SetSetting(db.LastFMSecret, secret); err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("couldn't set secret: %v", err)}}
}
return &Response{redirect: "/admin/home"}
}
func (c *Controller) ServeStartScanIncDo(_ *http.Request) *Response {
defer doScan(c.Scanner, scanner.ScanOptions{})
defer doScan(c.scanner, scanner.ScanOptions{})
return &Response{
redirect: "/admin/home",
flashN: []string{"incremental scan started. refresh for results"},
@@ -369,7 +360,7 @@ func (c *Controller) ServeStartScanIncDo(_ *http.Request) *Response {
}
func (c *Controller) ServeStartScanFullDo(_ *http.Request) *Response {
defer doScan(c.Scanner, scanner.ScanOptions{IsFull: true})
defer doScan(c.scanner, scanner.ScanOptions{IsFull: true})
return &Response{
redirect: "/admin/home",
flashN: []string{"full scan started. refresh for results"},
@@ -391,7 +382,7 @@ func (c *Controller) ServeCreateTranscodePrefDo(r *http.Request) *Response {
Client: client,
Profile: profile,
}
if err := c.DB.Create(&pref).Error; err != nil {
if err := c.dbc.Create(&pref).Error; err != nil {
return &Response{
redirect: "/admin/home",
flashW: []string{fmt.Sprintf("could not create preference: %v", err)},
@@ -406,7 +397,7 @@ func (c *Controller) ServeDeleteTranscodePrefDo(r *http.Request) *Response {
if client == "" {
return &Response{code: 400, err: "please provide a client"}
}
c.DB.
c.dbc.
Where("user_id=? AND client=?", user.ID, client).
Delete(db.TranscodePreference{})
return &Response{
@@ -424,7 +415,7 @@ func (c *Controller) ServePodcastAddDo(r *http.Request) *Response {
flashW: []string{fmt.Sprintf("could not create feed: %v", err)},
}
}
if _, err := c.Podcasts.AddNewPodcast(rssURL, feed); err != nil {
if _, err := c.podcasts.AddNewPodcast(rssURL, feed); err != nil {
return &Response{
redirect: "/admin/home",
flashW: []string{fmt.Sprintf("could not create feed: %v", err)},
@@ -440,7 +431,7 @@ func (c *Controller) ServePodcastDownloadDo(r *http.Request) *Response {
if err != nil {
return &Response{code: 400, err: "please provide a valid podcast id"}
}
if err := c.Podcasts.DownloadPodcastAll(id); err != nil {
if err := c.podcasts.DownloadPodcastAll(id); err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("error downloading: %v", err)}}
}
return &Response{
@@ -464,7 +455,7 @@ func (c *Controller) ServePodcastUpdateDo(r *http.Request) *Response {
default:
return &Response{code: 400, err: "please provide a valid podcast download type"}
}
if err := c.Podcasts.SetAutoDownload(id, setting); err != nil {
if err := c.podcasts.SetAutoDownload(id, setting); err != nil {
return &Response{
flashW: []string{fmt.Sprintf("could not update auto download setting: %v", err)},
code: 400,
@@ -481,7 +472,7 @@ func (c *Controller) ServePodcastDeleteDo(r *http.Request) *Response {
if err != nil {
return &Response{code: 400, err: "please provide a valid podcast id"}
}
if err := c.Podcasts.DeletePodcast(id); err != nil {
if err := c.podcasts.DeletePodcast(id); err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("error deleting: %v", err)}}
}
return &Response{
@@ -512,7 +503,7 @@ func (c *Controller) ServeInternetRadioStationAddDo(r *http.Request) *Response {
station.StreamURL = streamURL
station.Name = name
station.HomepageURL = homepageURL
if err := c.DB.Save(&station).Error; err != nil {
if err := c.dbc.Save(&station).Error; err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("error saving station: %v", err)}}
}
@@ -555,14 +546,14 @@ func (c *Controller) ServeInternetRadioStationUpdateDo(r *http.Request) *Respons
}
var station db.InternetRadioStation
if err := c.DB.Where("id=?", stationID).First(&station).Error; err != nil {
if err := c.dbc.Where("id=?", stationID).First(&station).Error; err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("find station by id: %v", err)}}
}
station.StreamURL = streamURL
station.Name = name
station.HomepageURL = homepageURL
if err := c.DB.Save(&station).Error; err != nil {
if err := c.dbc.Save(&station).Error; err != nil {
return &Response{code: 500, err: "please provide a valid internet radio station id"}
}
@@ -578,11 +569,11 @@ func (c *Controller) ServeInternetRadioStationDeleteDo(r *http.Request) *Respons
}
var station db.InternetRadioStation
if err := c.DB.Where("id=?", stationID).First(&station).Error; err != nil {
if err := c.dbc.Where("id=?", stationID).First(&station).Error; err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("find station by id: %v", err)}}
}
if err := c.DB.Where("id=?", stationID).Delete(&db.InternetRadioStation{}).Error; err != nil {
if err := c.dbc.Where("id=?", stationID).Delete(&db.InternetRadioStation{}).Error; err != nil {
return &Response{redirect: r.Referer(), flashW: []string{fmt.Sprintf("deleting radio station: %v", err)}}
}
@@ -621,6 +612,14 @@ func selectedUserIfAdmin(c *Controller, r *http.Request) (*db.User, error) {
if !user.IsAdmin && user.Name != selectedUsername {
return nil, fmt.Errorf("must be admin to perform actions for other users")
}
selectedUser := c.DB.GetUserByName(selectedUsername)
selectedUser := c.dbc.GetUserByName(selectedUsername)
return selectedUser, nil
}
func doScan(scanner *scanner.Scanner, opts scanner.ScanOptions) {
go func() {
if _, err := scanner.ScanAndClean(opts); err != nil {
log.Printf("error while scanning: %v\n", err)
}
}()
}

6
server/ctrladmin/handlers_raw.go
View File

@@ -16,7 +16,7 @@ func (c *Controller) ServeLoginDo(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, r.Referer(), http.StatusSeeOther)
return
}
user := c.DB.GetUserByName(username)
user := c.dbc.GetUserByName(username)
if user == nil || password != user.Password {
sessAddFlashW(session, []string{"invalid username / password"})
sessLogSave(session, w, r)
@@ -28,12 +28,12 @@ func (c *Controller) ServeLoginDo(w http.ResponseWriter, r *http.Request) {
// session and put the row into the request context
session.Values["user"] = user.ID
sessLogSave(session, w, r)
http.Redirect(w, r, c.Path("/admin/home"), http.StatusSeeOther)
http.Redirect(w, r, c.resolveProxyPath("/admin/home"), http.StatusSeeOther)
}
func (c *Controller) ServeLogout(w http.ResponseWriter, r *http.Request) {
session := r.Context().Value(CtxSession).(*sessions.Session)
session.Options.MaxAge = -1
sessLogSave(session, w, r)
http.Redirect(w, r, c.Path("/admin/login"), http.StatusSeeOther)
http.Redirect(w, r, c.resolveProxyPath("/admin/login"), http.StatusSeeOther)
}

65
server/ctrladmin/middleware.go
View File

@@ -1,65 +0,0 @@
package ctrladmin
import (
"context"
"fmt"
"net/http"
"github.com/gorilla/sessions"
"go.senan.xyz/gonic"
"go.senan.xyz/gonic/db"
)
func (c *Controller) WithSession(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
session, err := c.sessDB.Get(r, gonic.Name)
if err != nil {
http.Error(w, fmt.Sprintf("error getting session: %s", err), 500)
return
}
withSession := context.WithValue(r.Context(), CtxSession, session)
next.ServeHTTP(w, r.WithContext(withSession))
})
}
func (c *Controller) WithUserSession(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// session exists at this point
session := r.Context().Value(CtxSession).(*sessions.Session)
userID, ok := session.Values["user"].(int)
if !ok {
sessAddFlashW(session, []string{"you are not authenticated"})
sessLogSave(session, w, r)
http.Redirect(w, r, c.Path("/admin/login"), http.StatusSeeOther)
return
}
// take username from sesion and add the user row to the context
user := c.DB.GetUserByID(userID)
if user == nil {
// the username in the client's session no longer relates to a
// user in the database (maybe the user was deleted)
session.Options.MaxAge = -1
sessLogSave(session, w, r)
http.Redirect(w, r, c.Path("/admin/login"), http.StatusSeeOther)
return
}
withUser := context.WithValue(r.Context(), CtxUser, user)
next.ServeHTTP(w, r.WithContext(withUser))
})
}
func (c *Controller) WithAdminSession(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// session and user exist at this point
session := r.Context().Value(CtxSession).(*sessions.Session)
user := r.Context().Value(CtxUser).(*db.User)
if !user.IsAdmin {
sessAddFlashW(session, []string{"you are not an admin"})
sessLogSave(session, w, r)
http.Redirect(w, r, c.Path("/admin/login"), http.StatusSeeOther)
return
}
next.ServeHTTP(w, r)
})
}

62
server/ctrladmin/routes.go
View File

@@ -1,62 +0,0 @@
package ctrladmin
import (
"net/http"
"github.com/gorilla/mux"
"go.senan.xyz/gonic/server/ctrladmin/adminui"
)
func AddRoutes(c *Controller, r *mux.Router) {
// public routes (creates session)
r.Use(c.WithSession)
r.Handle("/login", c.H(c.ServeLogin))
r.Handle("/login_do", c.HR(c.ServeLoginDo)) // "raw" handler, updates session
staticHandler := http.StripPrefix("/admin", http.FileServer(http.FS(adminui.StaticFS)))
r.PathPrefix("/static").Handler(staticHandler)
// user routes (if session is valid)
routUser := r.NewRoute().Subrouter()
routUser.Use(c.WithUserSession)
routUser.Handle("/logout", c.HR(c.ServeLogout)) // "raw" handler, updates session
routUser.Handle("/home", c.H(c.ServeHome))
routUser.Handle("/change_username", c.H(c.ServeChangeUsername))
routUser.Handle("/change_username_do", c.H(c.ServeChangeUsernameDo))
routUser.Handle("/change_password", c.H(c.ServeChangePassword))
routUser.Handle("/change_password_do", c.H(c.ServeChangePasswordDo))
routUser.Handle("/change_avatar", c.H(c.ServeChangeAvatar))
routUser.Handle("/change_avatar_do", c.H(c.ServeChangeAvatarDo))
routUser.Handle("/delete_avatar_do", c.H(c.ServeDeleteAvatarDo))
routUser.Handle("/delete_user", c.H(c.ServeDeleteUser))
routUser.Handle("/delete_user_do", c.H(c.ServeDeleteUserDo))
routUser.Handle("/link_lastfm_do", c.H(c.ServeLinkLastFMDo))
routUser.Handle("/unlink_lastfm_do", c.H(c.ServeUnlinkLastFMDo))
routUser.Handle("/link_listenbrainz_do", c.H(c.ServeLinkListenBrainzDo))
routUser.Handle("/unlink_listenbrainz_do", c.H(c.ServeUnlinkListenBrainzDo))
routUser.Handle("/create_transcode_pref_do", c.H(c.ServeCreateTranscodePrefDo))
routUser.Handle("/delete_transcode_pref_do", c.H(c.ServeDeleteTranscodePrefDo))
// admin routes (if session is valid, and is admin)
routAdmin := routUser.NewRoute().Subrouter()
routAdmin.Use(c.WithAdminSession)
routAdmin.Handle("/create_user", c.H(c.ServeCreateUser))
routAdmin.Handle("/create_user_do", c.H(c.ServeCreateUserDo))
routAdmin.Handle("/update_lastfm_api_key", c.H(c.ServeUpdateLastFMAPIKey))
routAdmin.Handle("/update_lastfm_api_key_do", c.H(c.ServeUpdateLastFMAPIKeyDo))
routAdmin.Handle("/start_scan_inc_do", c.H(c.ServeStartScanIncDo))
routAdmin.Handle("/start_scan_full_do", c.H(c.ServeStartScanFullDo))
routAdmin.Handle("/add_podcast_do", c.H(c.ServePodcastAddDo))
routAdmin.Handle("/delete_podcast_do", c.H(c.ServePodcastDeleteDo))
routAdmin.Handle("/download_podcast_do", c.H(c.ServePodcastDownloadDo))
routAdmin.Handle("/update_podcast_do", c.H(c.ServePodcastUpdateDo))
routAdmin.Handle("/add_internet_radio_station_do", c.H(c.ServeInternetRadioStationAddDo))
routAdmin.Handle("/delete_internet_radio_station_do", c.H(c.ServeInternetRadioStationDeleteDo))
routAdmin.Handle("/update_internet_radio_station_do", c.H(c.ServeInternetRadioStationUpdateDo))
// middlewares should be run for not found handler
// https://github.com/gorilla/mux/issues/416
notFoundHandler := c.H(c.ServeNotFound)
notFoundRoute := r.NewRoute().Handler(notFoundHandler)
r.NotFoundHandler = notFoundRoute.GetHandler()
}