refactor to go pkg structure and add rb search

.gitignore

@@ -122,3 +122,4 @@ Temporary Items
 *.ldif
 user_vhost_list.conf
 userVhost
+rb-ldap

README.md

@@ -1,19 +1,26 @@
-# userVhost
+# rb-ldap
 
-Script to query ldap for user info to generate apache template conf for user
-vhosts.
+[![Go Report Card](https://goreportcard.com/badge/github.com/redbrick/rbldap)](https://goreportcard.com/report/github.com/redbrick/rbldap)
+
+Script to interact with Redbrick LDAP.
+
+* query ldap for user info to generate apache template conf for user vhosts.
+* Search for users in ldap
 
 ## Installation
 
 ```console
-go get github.com/redbrick/userVhost
+go get github.com/redbrick/rbldap/cmd/rb-ldap
 ```
 
 ## Run
 
 ```console
-userVhost ./ldap.secret
+rb-ldap
 ```
 
-The conf will be output to the current dir. Run `userVhost -h` to get a list of
-flags
+Run `rb-ldap -h` to get a list of flags and commands.
+
+## Notes
+
+The conf from `rb-ldag g` will be output to the current dir.

cmd/rb-ldap/main.go

@@ -0,0 +1,129 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/redbrick/rbldap/internal/pkg/rbldap"
+	"github.com/urfave/cli"
+)
+
+func main() {
+	app := cli.NewApp()
+	app.Name = "rb-ldap"
+	app.Usage = "Command line interface for Redbrick Ldap"
+	app.ArgsUsage = ""
+	app.HideVersion = true
+	app.EnableBashCompletion = true
+
+	app.Flags = []cli.Flag{
+		cli.StringFlag{
+			Name:  "user, u",
+			Value: "cn=root,ou=ldap,o=redbrick",
+			Usage: "ldap user, used for authentication",
+		},
+
+		cli.StringFlag{
+			Name:  "dcu-user",
+			Value: "CN=rblookup,OU=Service Accounts,DC=ad,DC=dcu,DC=ie",
+			Usage: "Active Directory user for DCU, used for authentication",
+		},
+
+		cli.StringFlag{
+			Name:  "host",
+			Value: "ldap.internal",
+			Usage: "ldap host to query",
+		},
+
+		cli.StringFlag{
+			Name:  "dcu-host",
+			Value: "ad.dcu.ie",
+			Usage: "DCU Active Directory host to query",
+		},
+
+		cli.IntFlag{
+			Name:  "port, p",
+			Value: 389,
+			Usage: "Port for ldap host",
+		},
+
+		cli.IntFlag{
+			Name:  "dcu-port",
+			Value: 389,
+			Usage: "Port for DCU Active Directory host",
+		},
+
+		cli.StringFlag{
+			Name:     "password",
+			Usage:    "password for the ldap server",
+			FilePath: "/etc/ldap.secret",
+		},
+
+		cli.StringFlag{
+			Name:     "dcu-password",
+			Usage:    "password for the DCU ldap server",
+			FilePath: "/etc/dcu_ldap.secret",
+		},
+
+		cli.BoolFlag{
+			Name:  "dry-run",
+			Usage: "output to console rather then file",
+		},
+	}
+	app.Commands = []cli.Command{
+		{
+			Name:    "generate",
+			Aliases: []string{"g"},
+			Usage:   "generate list for uservhost macro",
+			Flags: []cli.Flag{
+				cli.StringFlag{
+					Name:  "conf, c",
+					Value: "./user_vhost_list.conf",
+					Usage: "Output configuration `FILE`",
+				},
+			},
+			Action: rbldap.Generate,
+		},
+		{
+			Name:    "search",
+			Aliases: []string{"s"},
+			Usage:   "Search ldap for user",
+			Flags: []cli.Flag{
+				cli.StringFlag{
+					Name:  "mail, altmail",
+					Value: "*",
+					Usage: "User email",
+				},
+				cli.StringFlag{
+					Name:  "user, u, uid, nick, username",
+					Value: "*",
+					Usage: "User username",
+				},
+				cli.StringFlag{
+					Name:  "id",
+					Value: "*",
+					Usage: "DCU id Number",
+				},
+				cli.StringFlag{
+					Name:  "name, fullname",
+					Value: "*",
+					Usage: "User's fullname",
+				},
+				cli.BoolFlag{
+					Name:  "newbie, noob",
+					Usage: "filter for new users",
+				},
+				cli.BoolFlag{
+					Name:  "dcu, DCU",
+					Usage: "Query DCU Active Directory",
+				},
+			},
+			Action: rbldap.Search,
+		},
+	}
+
+	if err := app.Run(os.Args); err != nil {
+		fmt.Fprintf(os.Stderr, "error: %v\n", err)
+		os.Exit(1)
+	}
+}

internal/pkg/rbldap/generate.go

@@ -0,0 +1,36 @@
+package rbldap
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/urfave/cli"
+)
+
+// Generate takes cli context and generates user vhost for rbuser
+func Generate(ctx *cli.Context) error {
+	l, err := newRbLdap(ctx)
+	if err != nil {
+		return err
+	}
+	vhosts, err := l.Generate()
+	if err != nil {
+		return err
+	}
+	if ctx.Bool("dry-run") {
+		fmt.Print(strings.Join(vhosts, "\n"))
+		return nil
+	}
+	file, err := os.Create(ctx.String("conf"))
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+	n, err := file.WriteString(strings.Join(vhosts, "\n"))
+	if err != nil {
+		return err
+	}
+	fmt.Printf("wrote %d bytes %s\n", n, ctx.String("conf"))
+	return file.Sync()
+}

internal/pkg/rbldap/ldap.go

@@ -0,0 +1,43 @@
+package rbldap
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/redbrick/rbldap/pkg/rbuser"
+	"github.com/urfave/cli"
+)
+
+func newRbLdap(ctx *cli.Context) (*rbuser.RbLdap, error) {
+	if ctx.NArg() != 0 {
+		fmt.Fprintf(os.Stderr, "\n")
+		return &rbuser.RbLdap{}, fmt.Errorf("Missing required arguments")
+	}
+
+	conf := &rbuser.LdapConf{
+		User:     ctx.String("user"),
+		Password: ctx.String("password"),
+		Host:     ctx.String("host"),
+		Port:     ctx.Int("port"),
+	}
+	rb := rbuser.RbLdap{conf}
+	rb.Connect()
+	return &rb, nil
+}
+
+func newDcuLdap(ctx *cli.Context) (*rbuser.DcuLdap, error) {
+	if ctx.NArg() != 0 {
+		fmt.Fprintf(os.Stderr, "\n")
+		return &rbuser.DcuLdap{}, fmt.Errorf("Missing required arguments")
+	}
+
+	conf := &rbuser.LdapConf{
+		User:     ctx.String("dcu-user"),
+		Password: ctx.String("dcu-password"),
+		Host:     ctx.String("dcu-host"),
+		Port:     ctx.Int("dcu-port"),
+	}
+	dcu := rbuser.DcuLdap{conf}
+	dcu.Connect()
+	return &dcu, nil
+}

internal/pkg/rbldap/search.go

@@ -0,0 +1,74 @@
+package rbldap
+
+import (
+	"bytes"
+	"fmt"
+	"regexp"
+
+	"github.com/urfave/cli"
+)
+
+// Search command for cli app
+func Search(ctx *cli.Context) error {
+	mail := filter("altmail", ctx.String("mail"))
+	id := filter("id", ctx.String("id"))
+	var re = regexp.MustCompile(`\ `)
+	name := re.ReplaceAllString(ctx.String("name"), `*$1*$2*`)
+	if ctx.Bool("dcu") {
+		dcu, err := newDcuLdap(ctx)
+		if err != nil {
+			return err
+		}
+		user, searchErr := dcu.Search(filterAnd(
+			filter("displayName", name),
+			filter("cn", ctx.String("user")),
+			id),
+		)
+		if searchErr != nil {
+			return searchErr
+		}
+		return user.PrettyPrint()
+	}
+	rb, err := newRbLdap(ctx)
+	if err != nil {
+		return err
+	}
+	noob := ""
+	if ctx.Bool("noob") {
+		noob = "(newbie=TRUE)"
+	}
+	user, searchErr := rb.Search(filterAnd(
+		filter("cn", name),
+		filterOr(
+			filter("uid", ctx.String("user")),
+			filter("gecos", ctx.String("user")),
+		), id, mail, noob),
+	)
+	if searchErr != nil {
+		return searchErr
+	}
+	return user.PrettyPrint()
+}
+
+func filter(key, search string) string {
+	return fmt.Sprintf("(%s=%s)", key, search)
+}
+
+func filterAnd(args ...string) string {
+	return filterJoin("&", args)
+}
+
+func filterOr(args ...string) string {
+	return filterJoin("|", args)
+}
+
+func filterJoin(join string, args []string) string {
+	var buffer bytes.Buffer
+	buffer.WriteString("(")
+	buffer.WriteString(join)
+	for _, filter := range args {
+		buffer.WriteString(filter)
+	}
+	buffer.WriteString(")")
+	return buffer.String()
+}