Clean up scripts-proxy code

Author: quentinmit

server/common/oursrc/scripts-proxy/ldap/conn.go

@@ -43,13 +43,12 @@ func (c *conn) resolvePool(hostname string) (string, error) {
 	defer c.mu.Unlock()
 
 	escapedHostname := ldap.EscapeFilter(hostname)
-	req := ldap.NewSearchRequest(
-		c.baseDn,
-		ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false,
-		fmt.Sprintf("(|(scriptsVhostName=%s)(scriptsVhostAlias=%s))", escapedHostname, escapedHostname),
-		[]string{"scriptsVhostPoolIPv4"},
-		nil,
-	)
+	req := &ldap.SearchRequest{
+		BaseDN:     c.baseDn,
+		Scope:      ldap.ScopeWholeSubtree,
+		Filter:     fmt.Sprintf("(|(scriptsVhostName=%s)(scriptsVhostAlias=%s))", escapedHostname, escapedHostname),
+		Attributes: []string{"scriptsVhostPoolIPv4"},
+	}
 	sr, err := c.conn.Search(req)
 	if err != nil {
 		return "", err

server/common/oursrc/scripts-proxy/main.go

@@ -63,6 +63,7 @@ func (l *ldapTarget) HandleConn(netConn net.Conn) {
 			log.Printf("resolving default pool: %v", err)
 		}
 	}
+	// TODO: Serve an error page? Forward to scripts-director?
 	if pool == "" {
 		netConn.Close()
 		return
@@ -78,8 +79,8 @@ func (l *ldapTarget) HandleConn(netConn net.Conn) {
 	dp := &tcpproxy.DialProxy{
 		Addr: destAddrStr,
 	}
-	raddr := netConn.RemoteAddr().(*net.TCPAddr)
 	if l.localPoolRange.Contains(destAddr.IP) {
+		raddr := netConn.RemoteAddr().(*net.TCPAddr)
 		td := &TransparentDialer{
 			SourceAddr: &net.TCPAddr{
 				IP: raddr.IP,