Browse Source

fix insecure tls when trigger task

tags/v0.9.99
Unknwon 8 years ago
parent
commit
b9f5def5dc
5 changed files with 14 additions and 11 deletions
  1. 4
    1
      cmd/serve.go
  2. 1
    1
      gogs.go
  3. 2
    2
      models/pull.go
  4. 6
    6
      modules/httplib/httplib.go
  5. 1
    1
      templates/.VERSION

+ 4
- 1
cmd/serve.go View File

package cmd package cmd


import ( import (
"crypto/tls"
"fmt" "fmt"
"os" "os"
"os/exec" "os/exec"
strings.TrimPrefix(task.RefName, "refs/heads/") strings.TrimPrefix(task.RefName, "refs/heads/")
log.GitLogger.Trace("Trigger task: %s", reqURL) log.GitLogger.Trace("Trigger task: %s", reqURL)


resp, err := httplib.Head(reqURL).Response()
resp, err := httplib.Head(reqURL).SetTLSClientConfig(&tls.Config{
InsecureSkipVerify: true,
}).Response()
if err == nil { if err == nil {
resp.Body.Close() resp.Body.Close()
if resp.StatusCode/100 != 2 { if resp.StatusCode/100 != 2 {

+ 1
- 1
gogs.go View File

"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )


const APP_VER = "0.6.18.1025 Beta"
const APP_VER = "0.6.18.1026 Beta"


func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

+ 2
- 2
models/pull.go View File

func (pr *PullRequest) getHeadRepo(e Engine) (err error) { func (pr *PullRequest) getHeadRepo(e Engine) (err error) {
pr.HeadRepo, err = getRepositoryByID(e, pr.HeadRepoID) pr.HeadRepo, err = getRepositoryByID(e, pr.HeadRepoID)
if err != nil && !IsErrRepoNotExist(err) { if err != nil && !IsErrRepoNotExist(err) {
return fmt.Errorf("GetRepositoryByID (head): %v", err)
return fmt.Errorf("getRepositoryByID(head): %v", err)
} }
return nil return nil
} }


pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID) pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
if err != nil { if err != nil {
return fmt.Errorf("GetRepositoryByID (base): %v", err)
return fmt.Errorf("GetRepositoryByID(base): %v", err)
} }
return nil return nil
} }

+ 6
- 6
modules/httplib/httplib.go View File

} }


// return *Request with specific method // return *Request with specific method
func newBeegoRequest(url, method string) *Request {
func newRequest(url, method string) *Request {
var resp http.Response var resp http.Response
req := http.Request{ req := http.Request{
Method: method, Method: method,


// Get returns *Request with GET method. // Get returns *Request with GET method.
func Get(url string) *Request { func Get(url string) *Request {
return newBeegoRequest(url, "GET")
return newRequest(url, "GET")
} }


// Post returns *Request with POST method. // Post returns *Request with POST method.
func Post(url string) *Request { func Post(url string) *Request {
return newBeegoRequest(url, "POST")
return newRequest(url, "POST")
} }


// Put returns *Request with PUT method. // Put returns *Request with PUT method.
func Put(url string) *Request { func Put(url string) *Request {
return newBeegoRequest(url, "PUT")
return newRequest(url, "PUT")
} }


// Delete returns *Request DELETE method. // Delete returns *Request DELETE method.
func Delete(url string) *Request { func Delete(url string) *Request {
return newBeegoRequest(url, "DELETE")
return newRequest(url, "DELETE")
} }


// Head returns *Request with HEAD method. // Head returns *Request with HEAD method.
func Head(url string) *Request { func Head(url string) *Request {
return newBeegoRequest(url, "HEAD")
return newRequest(url, "HEAD")
} }


type Settings struct { type Settings struct {

+ 1
- 1
templates/.VERSION View File

0.6.18.1025 Beta
0.6.18.1026 Beta

Loading…
Cancel
Save