Cosmetic improvement

This commit is contained in:
Taras Kushnir
2026-02-04 11:50:12 +02:00
parent 6ce5f8e0ce
commit f4e03a3f31

View File

@@ -268,14 +268,12 @@ func (s *Server) MiddlewarePublicChain(rg *common.RouteGenerator, security alice
return alice.New(svc, common.Recovered, security, s.Metrics.HandlerIDFunc(rg.LastPath), ratelimiter, cop.Handler, monitoring.Logged)
}
func (s *Server) MiddlewarePrivateRead(public alice.Chain, timeout time.Duration) alice.Chain {
internalTimeout := common.HardTimeoutHandler(timeout)
return public.Append(s.maintenance, internalTimeout, s.private)
func (s *Server) MiddlewarePrivateRead(public alice.Chain, timeout alice.Constructor) alice.Chain {
return public.Append(s.maintenance, timeout, s.private)
}
func (s *Server) MiddlewarePrivateWrite(public alice.Chain, timeout time.Duration) alice.Chain {
internalTimeout := common.HardTimeoutHandler(timeout)
return public.Append(s.maintenance, defaultMaxBytesHandler, internalTimeout, s.csrf(s.csrfUserIDKeyFunc), s.private)
func (s *Server) MiddlewarePrivateWrite(public alice.Chain, timeout alice.Constructor) alice.Chain {
return public.Append(s.maintenance, defaultMaxBytesHandler, timeout, s.csrf(s.csrfUserIDKeyFunc), s.private)
}
func (s *Server) setupWithPrefix(rg *common.RouteGenerator, security alice.Constructor) {
@@ -298,8 +296,9 @@ func (s *Server) setupWithPrefix(rg *common.RouteGenerator, security alice.Const
// openWrite is protected by captcha, other "write" handlers are protected by CSRF token / auth
openWrite := public.Append(s.maintenance, defaultMaxBytesHandler, publicTimeout)
csrfEmail := openWrite.Append(s.csrf(s.csrfUserEmailKeyFunc))
privateWrite := s.MiddlewarePrivateWrite(public, 10*time.Second)
privateRead := s.MiddlewarePrivateRead(public, 10*time.Second)
internalTimeout := common.HardTimeoutHandler(10 * time.Second)
privateWrite := s.MiddlewarePrivateWrite(public, internalTimeout)
privateRead := s.MiddlewarePrivateRead(public, internalTimeout)
rg.Handle(rg.Post(common.LoginEndpoint), openWrite, http.HandlerFunc(s.postLogin))
rg.Handle(rg.Post(common.RegisterEndpoint), openWrite, http.HandlerFunc(s.postRegister))