Remove unnecessary imports and add returns

maikypedia · maikypedia · commit a1e38c34446a · 2023-10-26T01:16:43.000+02:00
diff --git a/go/ql/test/experimental/CWE-287/ImproperLdapAuth.expected b/go/ql/test/experimental/CWE-287/ImproperLdapAuth.expected
@@ -1,14 +1,14 @@
 edges
 | ImproperLdapAuth.go:18:18:18:24 | selection of URL | ImproperLdapAuth.go:18:18:18:32 | call to Query |
 | ImproperLdapAuth.go:18:18:18:32 | call to Query | ImproperLdapAuth.go:28:23:28:34 | bindPassword |
-| ImproperLdapAuth.go:80:18:80:19 | "" | ImproperLdapAuth.go:90:23:90:34 | bindPassword |
+| ImproperLdapAuth.go:87:18:87:19 | "" | ImproperLdapAuth.go:97:23:97:34 | bindPassword |
 nodes
 | ImproperLdapAuth.go:18:18:18:24 | selection of URL | semmle.label | selection of URL |
 | ImproperLdapAuth.go:18:18:18:32 | call to Query | semmle.label | call to Query |
 | ImproperLdapAuth.go:28:23:28:34 | bindPassword | semmle.label | bindPassword |
-| ImproperLdapAuth.go:80:18:80:19 | "" | semmle.label | "" |
-| ImproperLdapAuth.go:90:23:90:34 | bindPassword | semmle.label | bindPassword |
+| ImproperLdapAuth.go:87:18:87:19 | "" | semmle.label | "" |
+| ImproperLdapAuth.go:97:23:97:34 | bindPassword | semmle.label | bindPassword |
 subpaths
 #select
 | ImproperLdapAuth.go:28:23:28:34 | bindPassword | ImproperLdapAuth.go:18:18:18:24 | selection of URL | ImproperLdapAuth.go:28:23:28:34 | bindPassword | LDAP binding password depends on a $@. | ImproperLdapAuth.go:18:18:18:24 | selection of URL | user-provided value |
-| ImproperLdapAuth.go:90:23:90:34 | bindPassword | ImproperLdapAuth.go:80:18:80:19 | "" | ImproperLdapAuth.go:90:23:90:34 | bindPassword | LDAP binding password depends on a $@. | ImproperLdapAuth.go:80:18:80:19 | "" | user-provided value |
+| ImproperLdapAuth.go:97:23:97:34 | bindPassword | ImproperLdapAuth.go:87:18:87:19 | "" | ImproperLdapAuth.go:97:23:97:34 | bindPassword | LDAP binding password depends on a $@. | ImproperLdapAuth.go:87:18:87:19 | "" | user-provided value |
diff --git a/go/ql/test/experimental/CWE-287/ImproperLdapAuth.go b/go/ql/test/experimental/CWE-287/ImproperLdapAuth.go
@@ -20,15 +20,16 @@ func bad(w http.ResponseWriter, req *http.Request) (interface{}, error) {
 	// Connect to the LDAP server
 	l, err := ldap.Dial("tcp", fmt.Sprintf("%s:%d", ldapServer, ldapPort))
 	if err != nil {
-		log.Fatalf("Failed to connect to LDAP server: %v", err)
+		return fmt.Errorf("Failed to connect to LDAP server: %v", err), err
 	}
 	defer l.Close()
 
 	// BAD: user input is not sanetized
 	err = l.Bind(bindDN, bindPassword)
 	if err != nil {
-		log.Fatalf("LDAP bind failed: %v", err)
+		return fmt.Errorf("LDAP bind failed: %v", err), err
 	}
+	return nil, nil
 }
 
 func good1(w http.ResponseWriter, req *http.Request) (interface{}, error) {
@@ -40,7 +41,7 @@ func good1(w http.ResponseWriter, req *http.Request) (interface{}, error) {
 	// Connect to the LDAP server
 	l, err := ldap.Dial("tcp", fmt.Sprintf("%s:%d", ldapServer, ldapPort))
 	if err != nil {
-		log.Fatalf("Failed to connect to LDAP server: %v", err)
+		return fmt.Errorf("Failed to connect to LDAP server: %v", err), err
 	}
 	defer l.Close()
 
@@ -50,6 +51,10 @@ func good1(w http.ResponseWriter, req *http.Request) (interface{}, error) {
 	if !hasEmptyInput {
 		l.Bind(bindDN, bindPassword)
 	}
+	if err != nil {
+		return fmt.Errorf("LDAP bind failed: %v", err), err
+	}
+	return nil, nil
 }
 
 func good2(w http.ResponseWriter, req *http.Request) (interface{}, error) {
@@ -61,14 +66,16 @@ func good2(w http.ResponseWriter, req *http.Request) (interface{}, error) {
 	// Connect to the LDAP server
 	l, err := ldap.Dial("tcp", fmt.Sprintf("%s:%d", ldapServer, ldapPort))
 	if err != nil {
-		log.Fatalf("Failed to connect to LDAP server: %v", err)
+		return fmt.Errorf("Failed to connect to LDAP server: %v", err), err
 	}
 	defer l.Close()
 
 	// GOOD : bindPassword is not empty
 	if bindPassword != "" {
 		l.Bind(bindDN, bindPassword)
+		return nil, err
 	}
+	return nil, nil
 }
 
 func bad2(req *http.Request) {
diff --git a/go/vendor/gopkg.in/ldap.v2/stub.go b/go/vendor/gopkg.in/ldap.v2/stub.go

Original file line number	Diff line number	Diff line change
`@@ -20,15 +20,16 @@ func bad(w http.ResponseWriter, req *http.Request) (interface{}, error) {`
`20`	`20`	`// Connect to the LDAP server`
`21`	`21`	`l, err := ldap.Dial("tcp", fmt.Sprintf("%s:%d", ldapServer, ldapPort))`
`22`	`22`	`if err != nil {`
`23`		`- log.Fatalf("Failed to connect to LDAP server: %v", err)`
	`23`	`+ return fmt.Errorf("Failed to connect to LDAP server: %v", err), err`
`24`	`24`	`}`
`25`	`25`	`defer l.Close()`
`26`	`26`
`27`	`27`	`// BAD: user input is not sanetized`
`28`	`28`	`err = l.Bind(bindDN, bindPassword)`
`29`	`29`	`if err != nil {`
`30`		`- log.Fatalf("LDAP bind failed: %v", err)`
	`30`	`+ return fmt.Errorf("LDAP bind failed: %v", err), err`
`31`	`31`	`}`
	`32`	`+ return nil, nil`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`func good1(w http.ResponseWriter, req *http.Request) (interface{}, error) {`
`@@ -40,7 +41,7 @@ func good1(w http.ResponseWriter, req *http.Request) (interface{}, error) {`
`40`	`41`	`// Connect to the LDAP server`
`41`	`42`	`l, err := ldap.Dial("tcp", fmt.Sprintf("%s:%d", ldapServer, ldapPort))`
`42`	`43`	`if err != nil {`
`43`		`- log.Fatalf("Failed to connect to LDAP server: %v", err)`
	`44`	`+ return fmt.Errorf("Failed to connect to LDAP server: %v", err), err`
`44`	`45`	`}`
`45`	`46`	`defer l.Close()`
`46`	`47`
`@@ -50,6 +51,10 @@ func good1(w http.ResponseWriter, req *http.Request) (interface{}, error) {`
`50`	`51`	`if !hasEmptyInput {`
`51`	`52`	`l.Bind(bindDN, bindPassword)`
`52`	`53`	`}`
	`54`	`+ if err != nil {`
	`55`	`+ return fmt.Errorf("LDAP bind failed: %v", err), err`
	`56`	`+ }`
	`57`	`+ return nil, nil`
`53`	`58`	`}`
`54`	`59`
`55`	`60`	`func good2(w http.ResponseWriter, req *http.Request) (interface{}, error) {`
`@@ -61,14 +66,16 @@ func good2(w http.ResponseWriter, req *http.Request) (interface{}, error) {`
`61`	`66`	`// Connect to the LDAP server`
`62`	`67`	`l, err := ldap.Dial("tcp", fmt.Sprintf("%s:%d", ldapServer, ldapPort))`
`63`	`68`	`if err != nil {`
`64`		`- log.Fatalf("Failed to connect to LDAP server: %v", err)`
	`69`	`+ return fmt.Errorf("Failed to connect to LDAP server: %v", err), err`
`65`	`70`	`}`
`66`	`71`	`defer l.Close()`
`67`	`72`
`68`	`73`	`// GOOD : bindPassword is not empty`
`69`	`74`	`if bindPassword != "" {`
`70`	`75`	`l.Bind(bindDN, bindPassword)`
	`76`	`+ return nil, err`
`71`	`77`	`}`
	`78`	`+ return nil, nil`
`72`	`79`	`}`
`73`	`80`
`74`	`81`	`func bad2(req *http.Request) {`