Merge pull request #108 from mpsonntag/unlisted

Unlisted supported, dav removal, live cherry-picks

LGTM

Author: achilleas-k

.github/ISSUE_TEMPLATE/security.md

@@ -7,6 +7,6 @@ about: Report security vulnerability for this project
 <!--
 
 Please create a dummy issue with high-level description of the security vulnerability,
-then report details to Achilleas Koutsou <[email protected]> privately, thank you!
+then report details to the G-Node team at <[email protected]>, thank you!
 
 -->

conf/locale/locale_en-US.ini

@@ -404,8 +404,10 @@ delete_account_desc = This account is going to be deleted permanently, do you wa
 owner = Owner
 repo_name = Repository Name
 repo_name_helper = Will be used to define the URL (path) of the repository. It must be one word (no spaces) and can contain letters (a-z, A-Z), numbers (0-9), dash (-), underscore (_), or dot (.) characters. Repository names should be short, unique and specific (do not use a generic name like "dataset", "plos_paper", etc).
-visibility = Private
-visiblity_helper = Accessible only to owner and assigned collaborators
+visibility = Visibility
+unlisted = Unlisted
+visiblity_helper = This repository is <span class="ui red text">Private</span>; accessible only to owner and assigned collaborators
+unlisted_helper = This repository is <span class="ui red text">Unlisted</span>
 visiblity_helper_forced = New repositories are private by default. You can change the state later.
 visiblity_fork_helper = (Change of this value will affect all forks)
 license_warn = Before making this public: Have you added a LICENSE file?

internal/assets/conf/conf_gen.go

@@ -293,7 +293,7 @@ func runServ(c *cli.Context) error {
 
 // GIN specific: code altered from upstream, this function requires a review
 func runGit(cmd []string, requestMode db.AccessMode, user *db.User, owner *db.User,
-	repo *db.Repository) error {
+	repo *db.Repository) {
 	log.Info("Running %q", cmd)
 	gitCmd := exec.Command(cmd[0], cmd[1:]...)
 	if requestMode == db.AccessModeWrite {
@@ -313,8 +313,6 @@ func runGit(cmd []string, requestMode db.AccessMode, user *db.User, owner *db.Us
 	if err := gitCmd.Run(); err != nil {
 		fail("Internal error", "Failed to execute git command: %v", err)
 	}
-
-	return nil
 }
 
 // Make sure git-annex-shell does not make "bad" changes (refactored from repo)

internal/assets/public/public_gen.go

@@ -34,7 +34,6 @@ import (
 	"github.com/G-Node/gogs/internal/assets/templates"
 	"github.com/G-Node/gogs/internal/conf"
 	"github.com/G-Node/gogs/internal/context"
-	"github.com/G-Node/gogs/internal/dav"
 	"github.com/G-Node/gogs/internal/db"
 	"github.com/G-Node/gogs/internal/form"
 	"github.com/G-Node/gogs/internal/osutil"
@@ -47,7 +46,6 @@ import (
 	"github.com/G-Node/gogs/internal/route/repo"
 	"github.com/G-Node/gogs/internal/route/user"
 	"github.com/G-Node/gogs/internal/template"
-	"golang.org/x/net/webdav"
 )
 
 var Web = cli.Command{
@@ -155,11 +153,6 @@ func newMacaron() *macaron.Macaron {
 		},
 	}))
 
-	// GIN specifc code: Webdav handler todo: implement
-	h := &webdav.Handler{FileSystem: &dav.GinFS{BasePath: conf.Repository.Root}, LockSystem: webdav.NewMemLS(),
-		Logger: dav.Logger}
-	m.Map(h)
-
 	return m
 }
 
@@ -422,8 +415,6 @@ func runWeb(c *cli.Context) error {
 			m.Combo("/fork/:repoid").Get(repo.Fork).
 				Post(bindIgnErr(form.CreateRepo{}), repo.ForkPost)
 		}, reqSignIn)
-		m.Any("/:username/:reponame/_dav/*", dav.DavMiddle(), dav.Dav) // GIN specific code
-		m.Any("/:username/:reponame/_dav", dav.DavMiddle(), dav.Dav) // GIN specific code
 
 		m.Group("/:username/:reponame", func() {
 			m.Group("/settings", func() {

internal/assets/templates/templates_gen.go

@@ -403,8 +403,6 @@ func Init(customConf string) error {
 		return errors.Wrap(err, "mapping [doi] section")
 	} else if err = File.Section("cliconfig").MapTo(&CLIConfig); err != nil {
 		return errors.Wrap(err, "mapping [cliconfig] section")
-	} else if err = File.Section("dav").MapTo(&WebDav); err != nil {
-		return errors.Wrap(err, "mapping [dav] section")
 	}
 
 	HasRobotsTxt = osutil.IsFile(filepath.Join(CustomDir(), "robots.txt"))

internal/cmd/serv.go

@@ -378,12 +378,6 @@ var (
 	CLIConfig struct {
 		RSAHostKey string
 	}
-
-	WebDav struct {
-		On        bool
-		Logged    bool
-		AuthRealm string
-	}
 )
 
 type ServerOpts struct {