Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-28 09:42:05 +01:00
Code Issues Projects Releases Wiki Activity

Fix semgrep sprintf-host-port (#15782)

Browse Source 
Signed-off-by: Soumik Majumder <soumikm@vmware.com>
This commit is contained in:
Soumik Majumder 2021-10-14 17:40:27 +05:30 committed by GitHub
parent b4c2ff7768
commit eb7329a471
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/dao/pgsql.go
View File

@ -16,12 +16,14 @@ package dao
import ( import (
"fmt" "fmt"
"github.com/goharbor/harbor/src/common/models" "net"
"net/url" "net/url"
"os" "os"
"strconv" "strconv"
"time" "time"
"github.com/goharbor/harbor/src/common/models"
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/goharbor/harbor/src/common/utils" "github.com/goharbor/harbor/src/common/utils"
"github.com/goharbor/harbor/src/lib/log" "github.com/goharbor/harbor/src/lib/log"
@ -74,7 +76,7 @@ func NewPGSQL(host string, port string, usr string, pwd string, database string,
// Register registers pgSQL to orm with the info wrapped by the instance. // Register registers pgSQL to orm with the info wrapped by the instance.
func (p *pgsql) Register(alias ...string) error { func (p *pgsql) Register(alias ...string) error {
if err := utils.TestTCPConn(fmt.Sprintf("%s:%s", p.host, p.port), 60, 2); err != nil { if err := utils.TestTCPConn(net.JoinHostPort(p.host, p.port), 60, 2); err != nil {
return err return err
} }
@ -142,7 +144,7 @@ func NewMigrator(database *models.PostGreSQL) (*migrate.Migrate, error) {
dbURL := url.URL{ dbURL := url.URL{
Scheme: "postgres", Scheme: "postgres",
User: url.UserPassword(database.Username, database.Password), User: url.UserPassword(database.Username, database.Password),
Host: fmt.Sprintf("%s:%d", database.Host, database.Port), Host: net.JoinHostPort(database.Host, strconv.Itoa(database.Port)),
Path: database.Database, Path: database.Database,
RawQuery: fmt.Sprintf("sslmode=%s", database.SSLMode), RawQuery: fmt.Sprintf("sslmode=%s", database.SSLMode),
} }

5
src/pkg/exporter/harbor_cli.go
View File

@ -1,9 +1,10 @@
package exporter package exporter
import ( import (
"fmt" "net"
"net/http" "net/http"
"net/url" "net/url"
"strconv"
) )
var hbrCli *HarborClient var hbrCli *HarborClient
@ -19,7 +20,7 @@ type HarborClient struct {
func (hc HarborClient) harborURL(p string) url.URL { func (hc HarborClient) harborURL(p string) url.URL {
return url.URL{ return url.URL{
Scheme: hc.HarborScheme, Scheme: hc.HarborScheme,
Host: fmt.Sprintf("%s:%d", hc.HarborHost, hc.HarborPort), Host: net.JoinHostPort(hc.HarborHost, strconv.Itoa(hc.HarborPort)),
Path: p, Path: p,
} }
} }