Merge branch 'master' into webhook_for_pr_approval_rejection

.drone.yml

@@ -176,6 +176,20 @@ pipeline:
  when:
  event: [ push, tag, pull_request ]
 
+ test-mssql:
+ image: golang:1.11
+ pull: true
+ group: test
+ environment:
+ TAGS: bindata
+ TEST_LDAP: "1"
+ commands:
+ - curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
+ - apt-get install -y git-lfs
+ - make test-mssql
+ when:
+ event: [ push, tag, pull_request ]
+
  generate-coverage:
  image: golang:1.11
  pull: true
@@ -347,6 +361,15 @@ services:
  when:
  event: [ push, tag, pull_request ]
 
+ mssql:
+ image: microsoft/mssql-server-linux:latest
+ environment:
+ - ACCEPT_EULA=Y
+ - SA_PASSWORD=MwantsaSecurePassword1
+ - MSSQL_PID=Standard
+ when:
+ event: [ push, tag, pull_request ]
+
  ldap:
  image: gitea/test-openldap:latest
  when:

.github/stale.yml

@@ -0,0 +1,52 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 60
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 14
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+ - status/blocked 
+ - kind/security 
+ - lgtm/done
+ - reviewed/confirmed
+ - priority/critical
+ - kind/proposal
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+ This issue has been automatically marked as stale because it has not had
+ recent activity. It will be closed if no further activity occurs during the next 2 weeks. Thank you
+ for your contributions.
+
+# Comment to post when closing a stale Issue or Pull Request.
+closeComment: >
+ This issue has been automatically closed because of inactivity.
+ You can re-open it if needed.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 1
+
+# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
+pulls:
+ daysUntilStale: 60
+ markComment: >
+ This pull request has been automatically marked as stale because it has not had
+ recent activity. It will be closed if no further activity occurs during the next 2 months. Thank you
+ for your contributions.
+ closeComment: >
+ This pull request has been automatically closed because of inactivity.
+ You can re-open it if needed.
+

.gitignore

@@ -53,11 +53,14 @@ coverage.all
 /integrations/gitea-integration-mysql
 /integrations/gitea-integration-pgsql
 /integrations/gitea-integration-sqlite
+/integrations/gitea-integration-mssql
 /integrations/indexers-mysql
 /integrations/indexers-pgsql
 /integrations/indexers-sqlite
+/integrations/indexers-mssql
 /integrations/mysql.ini
 /integrations/pgsql.ini
+/integrations/mssql.ini
 /node_modules
 
 

CHANGELOG.md

@@ -4,6 +4,20 @@ This changelog goes through all the changes that have been made in each release
 without substantial changes to our git log; to see the highlights of what has
 been added to each release, please refer to the [blog](https://blog.gitea.io).
 
+## [1.6.2](https://github.com/go-gitea/gitea/releases/tag/v1.6.2) - 2018-12-21
+* SECURITY
+ * Sanitize uploaded file names (#5571) (#5573)
+ * HTMLEncode user added text (#5570) (#5575)
+* BUGFIXES
+ * Fix indexer reindex bug when gitea restart (#5563) (#5564)
+ * Remove a double slash in the HTTPS redirect with Let's Encrypt (#5537) (#5539)
+ * Fix bug when a read perm user to edit his issue (#5516) (#5534)
+ * Detect force push failure on deletion of protected branches (#5522) (#5531)
+ * Let's Encrypt handler listens on correct port for certificate validation (#5525) (#5527)
+ * Fix forgot deletion of notification when delete repository (#5506) (#5514)
+ * Fix undeleted content when deleting user (#5429) (#5509)
+ * Fix empty wiki (#5504) (#5508)
+
 ## [1.6.1](https://github.com/go-gitea/gitea/releases/tag/v1.6.1) - 2018-12-08
 * BUGFIXES
  * Fix dependent issue searching when gitea is run in subpath (#5392) (#5400)

Gopkg.toml

@@ -38,8 +38,11 @@ ignored = ["google.golang.org/appengine*"]
 
 [[override]]
  name = "github.com/go-xorm/xorm"
- #version = "0.6.5"
- revision = "ad69f7d8f0861a29438154bb0a20b60501298480"
+ revision = "401f4ee8ff8cbc40a4754cb12192fbe4f02f3979"
+
+[[override]]
+ name = "github.com/go-xorm/builder"
+ version = "0.3.3"
 
 [[override]]
  name = "github.com/go-sql-driver/mysql"

MAINTAINERS

@@ -20,7 +20,6 @@ Jonas Östanbäck <[email protected]> (@cez81)
 David Schneiderbauer <[email protected]> (@daviian)
 Peter Žeby <[email protected]> (@morlinest)
 Matti Ranta <[email protected]> (@techknowlogick)
-Michael Lustfield <[email protected]> (@MTecknology)
 Jonas Franz <[email protected]> (@JonasFranzDEV)
 Alexey Terentyev <[email protected]> (@axifive)
 Lanre Adelowo <[email protected]> (@adelowo)

Makefile

@@ -54,6 +54,10 @@ TEST_PGSQL_HOST ?= pgsql:5432
 TEST_PGSQL_DBNAME ?= testgitea
 TEST_PGSQL_USERNAME ?= postgres
 TEST_PGSQL_PASSWORD ?= postgres
+TEST_MSSQL_HOST ?= mssql:1433
+TEST_MSSQL_DBNAME ?= gitea
+TEST_MSSQL_USERNAME ?= sa
+TEST_MSSQL_PASSWORD ?= MwantsaSecurePassword1
 
 ifeq ($(OS), Windows_NT)
  EXECUTABLE := gitea.exe
@@ -74,9 +78,9 @@ clean:
  $(GO) clean -i ./...
  rm -rf $(EXECUTABLE) $(DIST) $(BINDATA) \
  integrations*.test \
- integrations/gitea-integration-pgsql/ integrations/gitea-integration-mysql/ integrations/gitea-integration-sqlite/ \
- integrations/indexers-mysql/ integrations/indexers-pgsql integrations/indexers-sqlite \
- integrations/mysql.ini integrations/pgsql.ini
+ integrations/gitea-integration-pgsql/ integrations/gitea-integration-mysql/ integrations/gitea-integration-sqlite/ integrations/gitea-integration-mssql/ \
+ integrations/indexers-mysql/ integrations/indexers-pgsql integrations/indexers-sqlite integrations/indexers-mssql \
+ integrations/mysql.ini integrations/pgsql.ini integrations/mssql.ini
 
 .PHONY: fmt
 fmt:
@@ -89,7 +93,7 @@ vet:
 .PHONY: generate
 generate:
  @hash go-bindata > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
- $(GO) get -u github.com/jteeuwen/go-bindata/...; \
+ $(GO) get -u github.com/jteeuwen/go-bindata/go-bindata; \
  fi
  $(GO) generate $(PACKAGES)
 
@@ -204,6 +208,11 @@ generate-ini:
  -e 's|{{TEST_PGSQL_USERNAME}}|${TEST_PGSQL_USERNAME}|g' \
  -e 's|{{TEST_PGSQL_PASSWORD}}|${TEST_PGSQL_PASSWORD}|g' \
  integrations/pgsql.ini.tmpl > integrations/pgsql.ini
+ sed -e 's|{{TEST_MSSQL_HOST}}|${TEST_MSSQL_HOST}|g' \
+ -e 's|{{TEST_MSSQL_DBNAME}}|${TEST_MSSQL_DBNAME}|g' \
+ -e 's|{{TEST_MSSQL_USERNAME}}|${TEST_MSSQL_USERNAME}|g' \
+ -e 's|{{TEST_MSSQL_PASSWORD}}|${TEST_MSSQL_PASSWORD}|g' \
+ integrations/mssql.ini.tmpl > integrations/mssql.ini
 
 .PHONY: test-mysql
 test-mysql: integrations.test generate-ini
@@ -213,6 +222,10 @@ test-mysql: integrations.test generate-ini
 test-pgsql: integrations.test generate-ini
  GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.test
 
+.PHONY: test-mssql
+test-mssql: integrations.test generate-ini
+ GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mssql.ini ./integrations.test
+
 .PHONY: bench-sqlite
 bench-sqlite: integrations.sqlite.test
  GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.cpuprofile=cpu.out -test.run DontRunTests -test.bench .

cmd/cmd.go

@@ -9,6 +9,7 @@ package cmd
 import (
  "errors"
  "fmt"
+ "strings"
 
  "code.gitea.io/gitea/models"
  "code.gitea.io/gitea/modules/setting"
@@ -22,6 +23,10 @@ func argsSet(c *cli.Context, args ...string) error {
  if !c.IsSet(a) {
  return errors.New(a + " is not set")
  }
+
+ if len(strings.TrimSpace(c.String(a))) == 0 {
+ return errors.New(a + " is required")
+ }
  }
  return nil
 }

cmd/hook.go

@@ -10,7 +10,6 @@ import (
  "fmt"
  "net/url"
  "os"
- "path/filepath"
  "strconv"
  "strings"
 
@@ -63,11 +62,6 @@ var (
  }
 )
 
-func hookSetup(logPath string) {
- setting.NewContext()
- log.NewGitLogger(filepath.Join(setting.LogRootPath, logPath))
-}
-
 func runHookPreReceive(c *cli.Context) error {
  if len(os.Getenv("SSH_ORIGINAL_COMMAND")) == 0 {
  return nil
@@ -79,7 +73,7 @@ func runHookPreReceive(c *cli.Context) error {
  setting.CustomConf = c.GlobalString("config")
  }
 
- hookSetup("hooks/pre-receive.log")
+ setup("hooks/pre-receive.log")
 
  // the environment setted on serv command
  repoID, _ := strconv.ParseInt(os.Getenv(models.ProtectedBranchRepoID), 10, 64)
@@ -112,10 +106,15 @@ func runHookPreReceive(c *cli.Context) error {
  branchName := strings.TrimPrefix(refFullName, git.BranchPrefix)
  protectBranch, err := private.GetProtectedBranchBy(repoID, branchName)
  if err != nil {
- log.GitLogger.Fatal(2, "retrieve protected branches information failed")
+ fail("Internal error", fmt.Sprintf("retrieve protected branches information failed: %v", err))
  }
 
  if protectBranch != nil && protectBranch.IsProtected() {
+ // check and deletion
+ if newCommitID == git.EmptySHA {
+ fail(fmt.Sprintf("branch %s is protected from deletion", branchName), "")
+ }
+
  // detect force push
  if git.EmptySHA != oldCommitID {
  output, err := git.NewCommand("rev-list", "--max-count=1", oldCommitID, "^"+newCommitID).RunInDir(repoPath)
@@ -126,17 +125,12 @@ func runHookPreReceive(c *cli.Context) error {
  }
  }
 
- // check and deletion
- if newCommitID == git.EmptySHA {
- fail(fmt.Sprintf("branch %s is protected from deletion", branchName), "")
- } else {
- userID, _ := strconv.ParseInt(userIDStr, 10, 64)
- canPush, err := private.CanUserPush(protectBranch.ID, userID)
- if err != nil {
- fail("Internal error", "Fail to detect user can push: %v", err)
- } else if !canPush {
- fail(fmt.Sprintf("protected branch %s can not be pushed to", branchName), "")
- }
+ userID, _ := strconv.ParseInt(userIDStr, 10, 64)
+ canPush, err := private.CanUserPush(protectBranch.ID, userID)
+ if err != nil {
+ fail("Internal error", "Fail to detect user can push: %v", err)
+ } else if !canPush {
+ fail(fmt.Sprintf("protected branch %s can not be pushed to", branchName), "")
  }
  }
  }
@@ -155,7 +149,7 @@ func runHookUpdate(c *cli.Context) error {
  setting.CustomConf = c.GlobalString("config")
  }
 
- hookSetup("hooks/update.log")
+ setup("hooks/update.log")
 
  return nil
 }
@@ -171,7 +165,7 @@ func runHookPostReceive(c *cli.Context) error {
  setting.CustomConf = c.GlobalString("config")
  }
 
- hookSetup("hooks/post-receive.log")
+ setup("hooks/post-receive.log")
 
  // the environment setted on serv command
  repoID, _ := strconv.ParseInt(os.Getenv(models.ProtectedBranchRepoID), 10, 64)