github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-05-13 04:38:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #71 from skeeey/code_scan

Browse Source 
fix code scan issue
This commit is contained in:
OpenShift Merge Robot
2020-09-10 04:16:35 -04:00
committed by GitHub
parent 58409319ba a01b1783be
commit e8bef5622e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/registration/main.go
View File

@@ -43,7 +43,9 @@ func newRegistrationCommand() *cobra.Command {
Use: "registration",
Short: "Spoke Cluster Registration",
Run: func(cmd *cobra.Command, args []string) {
cmd.Help()
if err := cmd.Help(); err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err)
}
os.Exit(1)
},
}

6
pkg/spoke/spokeagent.go
View File

@@ -344,7 +344,7 @@ func (o *SpokeAgentOptions) hasValidHubClientConfig() (bool, error) {
}
certPath := path.Join(o.HubKubeconfigDir, hubclientcert.TLSCertFile)
certData, err := ioutil.ReadFile(certPath)
certData, err := ioutil.ReadFile(path.Clean(certPath))
if err != nil {
klog.V(4).Infof("Unable to load TLS cert file %q", certPath)
return false, nil
@@ -368,7 +368,7 @@ func (o *SpokeAgentOptions) getOrGenerateClusterAgentNames() (string, string) {
// and then load the cluster name from the mounted secret
clusterNameFilePath := path.Join(o.HubKubeconfigDir, hubclientcert.ClusterNameFile)
clusterNameBytes, err := ioutil.ReadFile(clusterNameFilePath)
clusterNameBytes, err := ioutil.ReadFile(path.Clean(clusterNameFilePath))
if err != nil {
// generate random cluster name if faild
clusterName = generateClusterName()
@@ -379,7 +379,7 @@ func (o *SpokeAgentOptions) getOrGenerateClusterAgentNames() (string, string) {
// try to load agent name from the mounted secret
agentNameFilePath := path.Join(o.HubKubeconfigDir, hubclientcert.AgentNameFile)
agentNameBytes, err := ioutil.ReadFile(agentNameFilePath)
agentNameBytes, err := ioutil.ReadFile(path.Clean(agentNameFilePath))
var agentName string
if err != nil {
// generate random agent name if faild