Skip to content

Commit

Permalink
Revert "pkg/server: delete more remnants of long-deleted setup wizard"
Browse files Browse the repository at this point in the history
This reverts commit b663eac.

Reason: broke tests I didn't notice (facepalm). Will redo this
completely while fixing tests later.
  • Loading branch information
bradfitz committed Jan 15, 2024
1 parent 7e486bd commit 6746b8c
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 0 deletions.
70 changes: 70 additions & 0 deletions pkg/server/wizard.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/*
Copyright 2012 The Perkeep Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package server

import (
"fmt"
"net/http"

"go4.org/jsonconfig"
"perkeep.org/pkg/auth"
"perkeep.org/pkg/blobserver"
)

// SetupHandler handles serving the wizard setup page.
type SetupHandler struct {
config jsonconfig.Obj
}

func init() {
blobserver.RegisterHandlerConstructor("setup", newSetupFromConfig)
}

func newSetupFromConfig(ld blobserver.Loader, conf jsonconfig.Obj) (h http.Handler, err error) {
wizard := &SetupHandler{config: conf}
return wizard, nil
}

func (sh *SetupHandler) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
if !auth.IsLocalhost(req) {
fmt.Fprintf(rw,
"<html><body>Setup only allowed from localhost"+
"<p><a href='/'>Back</a></p>"+
"</body></html>\n")
return
}
http.Redirect(rw, req, "https://perkeep.org/doc/server-config", http.StatusMovedPermanently)
return

// TODO: this file and the code in wizard-html.go is outdated. Anyone interested enough
// can take care of updating it as something nicer which would fit better with the
// react UI. But in the meantime we don't link to it anymore.

// if req.Method == "POST" {
// err := req.ParseMultipartForm(10e6)
// if err != nil {
// httputil.ServeError(rw, req, err)
// return
// }
// if len(req.Form) > 0 {
// handleSetupChange(rw, req)
// }
// return
// }

// sendWizard(rw, req, false)
}
6 changes: 6 additions & 0 deletions pkg/serverinit/serverinit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,12 @@ func TestInstallHandlers(t *testing.T) {
authWrapped: true,
},

{
prefix: "/setup/",
handlerType: reflect.TypeOf(&server.SetupHandler{}),
prefixWrapped: true,
},

{
prefix: "/bs/camli/",
handlerType: reflect.TypeOf(http.HandlerFunc(nil)),
Expand Down

0 comments on commit 6746b8c

Please sign in to comment.