users is an organizational unit

.github/workflows/release-please.yml

@@ -1,27 +0,0 @@
-on:
-  pull_request:
-  push:
-    branches:
-      - dev
-
-permissions:
-  contents: write
-  pull-requests: write
-
-name: release-please
-
-jobs:
-  release-please:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: google-github-actions/release-please-action@v3
-        with:
-          release-type: go
-          package-name: GLAuth
-          path: v2
-          default-branch: master
-          pull-request-title-pattern: "ci: release ${version}"
-          token: ${{ secrets.RELEASE_PLEASE_TOKEN }}
-          extra-files: |
-            v2/internal/version/const.go

.gitmodules

@@ -1,12 +0,0 @@
-[submodule "v2/pkg/plugins/glauth-sqlite"]
-	path = v2/pkg/plugins/glauth-sqlite
-	url = https://github.com/glauth/glauth-sqlite
-[submodule "v2/pkg/plugins/glauth-mysql"]
-	path = v2/pkg/plugins/glauth-mysql
-	url = https://github.com/glauth/glauth-mysql
-[submodule "v2/pkg/plugins/glauth-postgres"]
-	path = v2/pkg/plugins/glauth-postgres
-	url = https://github.com/glauth/glauth-postgres
-[submodule "v2/pkg/plugins/glauth-pam"]
-	path = v2/pkg/plugins/glauth-pam
-	url = https://github.com/glauth/glauth-pam

v2/CHANGELOG.md

@@ -1,22 +0,0 @@
-# Changelog
-
-## [2.3.0](https://github.com/glauth/glauth/compare/v2.2.0...v2.3.0) (2023-10-02)
-
-
-### ⚠ BREAKING CHANGES
-
-* **plugins:** Rename the groups table to ldapgroups ([#326](https://github.com/glauth/glauth/issues/326))
-
-### Features
-
-* Update migration code to support table names ([#339](https://github.com/glauth/glauth/issues/339)) ([349431c](https://github.com/glauth/glauth/commit/349431c6caa0388d17ab987621eb9be5f019155e))
-
-
-### Bug Fixes
-
-* **plugins:** Rename the groups table to ldapgroups ([#326](https://github.com/glauth/glauth/issues/326)) ([675b236](https://github.com/glauth/glauth/commit/675b236328a21a65daa7876a1a3c6900b85b1964))
-
-
-### Miscellaneous Chores
-
-* release 2.3.0 ([0c11325](https://github.com/glauth/glauth/commit/0c11325a2482d5067c805a4c7ed948a5e337b8f8))

v2/Makefile

@@ -16,21 +16,14 @@ GIT_IS_TAG_COMMIT=$(shell git describe --abbrev=0 --tags > /dev/null 2> /dev/nul
 GIT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD)
 
 # Build variables
-BUILD_VARS?=-s -w
-BUILD_FILES=.
-TRIM_FLAGS>?=-trimpath
+BUILD_VARS=-s -w -X main.GitCommit=${GIT_COMMIT} -X main.GitBranch=${GIT_BRANCH} -X main.BuildTime=${BUILD_TIME} -X main.GitClean=${GIT_CLEAN} -X main.LastGitTag=${LAST_GIT_TAG} -X main.GitTagIsCommit=${GIT_IS_TAG_COMMIT}
+BUILD_FILES=glauth.go
+TRIM_FLAGS=-gcflags "all=-trimpath=${PWD}" -asmflags "all=-trimpath=${PWD}"
 
 # Targets
 MAIN_TARGETS=linux/amd64,linux/386,linux/arm64,linux/arm-7,darwin/amd64,darwin/arm64,windows/amd64,windows/386
 PLUGIN_TARGETS=linux/amd64,linux/386,linux/arm64,linux/arm-7,darwin/amd64,darwin/arm64
 
-# For release process
-GO_RELEASE_V=$(shell go version | { read _ _ v _; echo $${v#go}; })
-
-# Build
-GOOS?=linux
-GOARCH?=amd64
-
 # Plugins
 -include pkg/plugins/*/Makefile
 
@@ -81,43 +74,29 @@ format:
 devrun:
 	go run ${BUILD_FILES} -c sample-simple.cfg
 
-mkbindir:
-	@echo "create directory bin/$(GOOS)$(GOARCH)"
-	@mkdir -p bin/$(GOOS)$(GOARCH)
-.PHONY: mkbindir
-
-build: mkbindir
-	@go build ${TRIM_FLAGS} -ldflags "${BUILD_VARS}" -o bin/$(GOOS)$(GOARCH)/glauth -buildvcs=false .
-	$(MAKE) sha256
-.PHONY: build
-
-sha256:
-	@sha256sum bin/$(GOOS)$(GOARCH)/glauth > bin/$(GOOS)$(GOARCH)/glauth.sha256
-.PHONY: sha256
-
 linux386:
-	GOOS=linux GOARCH=386 $(MAKE) build
+	mkdir -p bin/$@ && GOOS=linux GOARCH=386 go build ${TRIM_FLAGS} -ldflags "${BUILD_VARS}" -o bin/$@/glauth ${BUILD_FILES} && cd bin/$@ && sha256sum glauth > glauth.sha256
 
 linuxamd64:
-	GOOS=linux GOARCH=amd64 $(MAKE) build
+	mkdir -p bin/$@ && GOOS=linux GOARCH=amd64 go build ${TRIM_FLAGS} -ldflags "${BUILD_VARS}" -o bin/$@/glauth ${BUILD_FILES} && cd bin/$@ && sha256sum glauth > glauth.sha256
 
 linuxarm:
-	GOOS=linux GOARCH=arm $(MAKE) build
+	mkdir -p bin/$@ && GOOS=linux GOARCH=arm go build ${TRIM_FLAGS} -ldflags "${BUILD_VARS}" -o bin/$@/glauth ${BUILD_FILES} && cd bin/$@ && sha256sum glauth > glauth.sha256
 
 linuxarm64:
-	GOOS=linux GOARCH=arm64 $(MAKE) build
+	mkdir -p bin/$@ && GOOS=linux GOARCH=arm64 go build ${TRIM_FLAGS} -ldflags "${BUILD_VARS}" -o bin/$@/glauth ${BUILD_FILES} && cd bin/$@ && sha256sum glauth > glauth.sha256
 
 darwinamd64:
-	GOOS=darwin GOARCH=amd64 CGO_ENABLED=1 $(MAKE) build
+	mkdir -p bin/$@ && GOOS=darwin GOARCH=amd64 CGO_ENABLED=1 go build ${TRIM_FLAGS} -ldflags "${BUILD_VARS}" -o bin/$@/glauth ${BUILD_FILES} && cd bin/$@ && sha256sum glauth > glauth.sha256
 
 darwinarm64:
-	GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 $(MAKE) build
+	mkdir -p bin/$@ && GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 go build ${TRIM_FLAGS} -ldflags "${BUILD_VARS}" -o bin/$@/glauth ${BUILD_FILES} && cd bin/$@ && sha256sum glauth > glauth.sha256
 
 win386:
-	GOOS=windows GOARCH=386 $(MAKE) build
+	mkdir -p bin/$@ && GOOS=windows GOARCH=386 go build ${TRIM_FLAGS} -ldflags "${BUILD_VARS}" -o bin/$@/glauth ${BUILD_FILES} && cd bin/$@ && sha256sum glauth > glauth.sha256
 
 winamd64:
-	GOOS=windows GOARCH=amd64 $(MAKE) build
+	mkdir -p bin/$@ && GOOS=windows GOARCH=amd64 go build ${TRIM_FLAGS} -ldflags "${BUILD_VARS}" -o bin/$@/glauth ${BUILD_FILES} && cd bin/$@ && sha256sum glauth > glauth.sha256
 
 verify:
 	@for binary in linux386 linuxamd64 linuxarm linuxarm64 darwinamd64 darwinarm64 win386 winamd64; do cd bin/$$binary && sha256sum glauth.sha256 -c && cd ../..; done
@@ -126,7 +105,6 @@ pull-plugin:
 	@git submodule add $U $M && \
 	(for pkg in $$(cat $$M/go.mod | awk '/^require [a-z]/{print $$2} /^\)/{rblock=0} rblock{if($$4!="indirect" && $$1!~"glauth"){print $$1}} /^require \(/{rblock=1}'); do if [ "$$(grep $$pkg go.mod &>/dev/null)" = "" ]; then go get $$pkg; fi; done)
 
-#pull-base-plugins: @ pull plugins for local building
 pull-base-plugins:
 	@U=https://github.com/glauth/glauth-sqlite M=pkg/plugins/glauth-sqlite make pull-plugin && \
 	U=https://github.com/glauth/glauth-mysql M=pkg/plugins/glauth-mysql make pull-plugin && \
@@ -139,24 +117,21 @@ forget-plugin:
 	git rm --cache $M && \
 	go mod tidy
 
-#forget-plugin: @ remove plugins, restoring original file structure
 forget-plugins:
 	for pkg in pkg/plugins/*/go.mod; do\
 		P=$$(echo $$pkg | cut -d'/' -f 3) M=$$(dirname $$pkg) make forget-plugin;\
 	done
 
-#releasemain: @ build main binaries for distribution
 releasemain:
-	@xgo -v -ldflags="${BUILD_VARS}" -trimpath -go ${GO_RELEASE_V} -out glauth -dest bin -buildvcs=false --targets="${MAIN_TARGETS}" .
+	@xgo -v -ldflags="${BUILD_VARS}" -trimpath -go 1.18.1 -out glauth -dest bin -buildvcs=false --targets="${MAIN_TARGETS}" .
 
 releaseplugin:
-	@xgo -v -ldflags="${BUILD_VARS}" -trimpath -go ${GO_RELEASE_V} -out $P -dest bin -buildvcs=false -buildmode=plugin --targets="${PLUGIN_TARGETS}" --pkg $M/$P.go . && \
+	@xgo -v -ldflags="${BUILD_VARS}" -trimpath -go 1.18.1 -out $P -dest bin -buildvcs=false -buildmode=plugin --targets="${PLUGIN_TARGETS}" --pkg $M/$P.go . && \
 	(cd bin && for lib in $$(ls $$P-*); do sudo mv $$lib $$lib.so; done)
 
-#releaseplugins: @ build base plugins for distribution
 releaseplugins:
 	@for pkg in pkg/plugins/*/go.mod; do\
-		M=pkg/plugins/$$(echo $$pkg | cut -d'/' -f 3) && P=$$(echo $$M | grep -oP 'glauth-\K\w+') && M=$$M P=$$P make releaseplugin;\
+		P=$$(echo $$pkg | cut -d'/' -f 3) && make release-$$P;\
 	done
 
 releasedockermain:

v2/glauth.go

@@ -3,20 +3,10 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"net/http"
-	"os"
-	"os/signal"
-	"path/filepath"
-	"reflect"
-	"strings"
-	"syscall"
-	"time"
-
 	"github.com/GeertJohan/yubigo"
 	"github.com/arl/statsviz"
 	docopt "github.com/docopt/docopt-go"
 	"github.com/fsnotify/fsnotify"
-	"github.com/glauth/glauth/v2/internal/version"
 	"github.com/glauth/glauth/v2/pkg/config"
 	"github.com/glauth/glauth/v2/pkg/frontend"
 	"github.com/glauth/glauth/v2/pkg/logging"
@@ -27,8 +17,22 @@ import (
 	"github.com/rs/zerolog"
 	"gopkg.in/amz.v3/aws"
 	"gopkg.in/amz.v3/s3"
+	"net/http"
+	"os"
+	"path/filepath"
+	"reflect"
+	"strings"
+	"time"
 )
 
+// Set with buildtime vars
+var LastGitTag string
+var BuildTime string
+var GitCommit string
+var GitClean string
+var GitBranch string
+var GitTagIsCommit string
+
 const programName = "glauth"
 
 var usage = `glauth: securely expose your LDAP for external auth
@@ -43,7 +47,6 @@ Options:
   -K <aws_key_id>           AWS Key ID.
   -S <aws_secret_key>       AWS Secret Key.
   -r <aws_region>           AWS Region [default: us-east-1].
-  --aws_endpoint_url <url>  Custom S3 endpoint.
   --ldap <address>          Listen address for the LDAP server.
   --ldaps <address>         Listen address for the LDAPS server.
   --ldaps-cert <cert-file>  Path to cert file for the LDAPS server.
@@ -61,6 +64,48 @@ var (
 	activeConfig = &config.Config{}
 )
 
+// Reads builtime vars and returns a full string containing info about
+// the currently running version of the software. Primarily used by the
+// --version flag at runtime.
+func getVersionString() string {
+
+	var versionstr string
+
+	versionstr = "GLauth"
+
+	// Notate the git context of the build
+	switch {
+	// If a release, use the tag
+	case GitClean == "1" && GitTagIsCommit == "1":
+		versionstr += " " + LastGitTag + "\n\n"
+
+	// If this branch had a tag before, mention the branch and the tag to give a rough idea of the base version
+	case len(GitBranch) > 1 && len(LastGitTag) > 1:
+		versionstr += "\nNon-release build from branch " + GitBranch + ", based on tag " + LastGitTag + "\n\n"
+
+	// If no previous tag specified, just mention the branch
+	case len(GitBranch) > 1:
+		versionstr += "\nNon-release build from branch " + GitBranch + "\n\n"
+
+	// Fallback message, if all else fails
+	default:
+		versionstr += "\nNon-release build\n\n"
+	}
+
+	// Include build time
+	if len(BuildTime) > 1 {
+		versionstr += "Build time: " + BuildTime + "\n"
+	}
+
+	// Add commit hash
+	if GitClean == "1" && len(GitCommit) > 1 {
+		versionstr += "Commit: " + GitCommit + "\n"
+	}
+
+	return versionstr
+
+}
+
 func main() {
 	if err := parseArgs(); err != nil {
 		fmt.Println("Could not parse command-line arguments")
@@ -89,7 +134,7 @@ func main() {
 
 func startService() {
 	// stats
-	stats.General.Set("version", stats.Stringer(version.Version))
+	stats.General.Set("version", stats.Stringer(LastGitTag))
 
 	// web API
 	if activeConfig.API.Enabled {
@@ -115,45 +160,40 @@ func startService() {
 		server.Logger(log),
 		server.Config(activeConfig),
 	)
-
 	if err != nil {
 		log.Error().Err(err).Msg("could not create server")
 		os.Exit(1)
 	}
 
 	if activeConfig.LDAP.Enabled {
-		go func() {
+		// Don't block if also starting a LDAPS server afterwards
+		shouldBlock := !activeConfig.LDAPS.Enabled
+
+		if shouldBlock {
 			if err := s.ListenAndServe(); err != nil {
 				log.Error().Err(err).Msg("could not start LDAP server")
 				os.Exit(1)
 			}
-		}()
+		} else {
+			go func() {
+				if err := s.ListenAndServe(); err != nil {
+					log.Error().Err(err).Msg("could not start LDAP server")
+					os.Exit(1)
+				}
+			}()
+		}
 	}
 
 	if activeConfig.LDAPS.Enabled {
-		go func() {
-			if err := s.ListenAndServeTLS(); err != nil {
-				log.Error().Err(err).Msg("could not start LDAPS server")
-				os.Exit(1)
-			}
-		}()
+		// Always block here
+		if err := s.ListenAndServeTLS(); err != nil {
+			log.Error().Err(err).Msg("could not start LDAPS server")
+			os.Exit(1)
+		}
 	}
 
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
-
-	// Block until we receive our signal.
-	<-c
-
-	// Doesn't block if no connections, but will otherwise wait
-	// until the timeout deadline.
-	s.Shutdown()
-
-	// Optionally, you could run srv.Shutdown in a goroutine and block on
-	// <-ctx.Done() if your application should wait for other services
-	// to finalize based on context cancellation.
 	log.Info().Msg("AP exit")
-	os.Exit(0)
+	os.Exit(1)
 }
 
 func startConfigWatcher() {
@@ -209,7 +249,7 @@ func startConfigWatcher() {
 func parseArgs() error {
 	var err error
 
-	if args, err = docopt.Parse(usage, nil, true, version.GetVersion(), false); err != nil {
+	if args, err = docopt.Parse(usage, nil, true, getVersionString(), false); err != nil {
 		return err
 	}
 
@@ -228,17 +268,10 @@ func parseConfigFile(configFileLocation string) (*config.Config, error) {
 
 	// parse the config file
 	if strings.HasPrefix(configFileLocation, "s3://") {
-		region, present := aws.Regions[args["-r"].(string)]
-		if present == false {
+		if _, present := aws.Regions[args["-r"].(string)]; present == false {
 			return &cfg, fmt.Errorf("invalid AWS region: %s", args["-r"])
 		}
-		if args["--aws_endpoint_url"] != nil {
-			region = aws.Region{
-				Name:       "User defined",
-				S3Endpoint: args["--aws_endpoint_url"].(string),
-			}
-			present = true
-		}
+		region := aws.Regions[args["-r"].(string)]
 		auth, err := aws.EnvAuth()
 		if err != nil {
 			if args["-K"] == nil || args["-S"] == nil {

v2/go.mod

@@ -38,7 +38,7 @@ require (
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
 	github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect
-	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/sys v0.1.0 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 )

v2/go.sum

@@ -370,8 +370,8 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

v2/internal/version/const.go

@@ -1,5 +0,0 @@
-package version
-
-// Version is the tag of the latest release, it gets changed by the ci
-// process when a release is happening
-const Version = "v2.3.0" // x-release-please-version

v2/internal/version/vcs.go

@@ -1,68 +0,0 @@
-package version
-
-import (
-	"fmt"
-	"runtime/debug"
-)
-
-type gitInfo struct {
-	BuildTime string
-	Commit    string
-	Dirty     bool
-}
-
-// GetVersion reads builtime vars and returns a full string containing info about
-// the currently running version of the software. Primarily used by the
-// --version flag at runtime.
-func GetVersion() string {
-
-	// TODO @shipperizer see if it's worth replacing with info.Main.Path
-	// aka github.com/glauth/glauth/v2 - not great but worth checking
-
-	name := "GLauth"
-
-	info, ok := debug.ReadBuildInfo()
-
-	if !ok {
-		return fmt.Sprintf(`
-%s
-Non-release build`,
-			name)
-	}
-
-	gitInfo := vcsInfo(info.Settings)
-
-	// If a release, use the tag
-	if !gitInfo.Dirty {
-		return fmt.Sprintf(`%s %s
-Build time: %s
-Commit: %s`, name, Version, gitInfo.BuildTime, gitInfo.Commit)
-	}
-
-	return fmt.Sprintf(`%s
-Non-release build based on tag %s
-Build time: %s
-Commit: %s`, name, Version, gitInfo.BuildTime, gitInfo.Commit)
-
-}
-
-func vcsInfo(settings []debug.BuildSetting) *gitInfo {
-	info := new(gitInfo)
-
-	info.BuildTime = "unknown"
-	info.Commit = "unknown"
-	info.Dirty = false
-
-	for _, v := range settings {
-		switch v.Key {
-		case "vcs.revision":
-			info.Commit = v.Value
-		case "vcs.modified":
-			info.Dirty = v.Value == "true"
-		case "vcs.time":
-			info.BuildTime = v.Value
-		}
-	}
-
-	return info
-}

v2/pkg/plugins/basesqlhandler.go

@@ -28,7 +28,7 @@ type SqlBackend interface {
 	// Create db/schema if necessary
 	CreateSchema(db *sql.DB)
 	// Migrate schema if necessary
-	MigrateSchema(db *sql.DB, checker func(*sql.DB, string, string) bool)
+	MigrateSchema(db *sql.DB, checker func(*sql.DB, string) bool)
 	//
 	GetPrepareSymbol() string
 }
@@ -88,11 +88,14 @@ func NewDatabaseHandler(sqlBackend SqlBackend, opts ...handler.Option) handler.H
 	return handler
 }
 
-func ColumnExists(db *sql.DB, tableName string, columnName string) bool {
+func ColumnExists(db *sql.DB, columnName string) bool {
 	var found string
-	err := db.QueryRow(fmt.Sprintf(`SELECT COUNT(%s) FROM %s`, columnName, tableName)).Scan(
+	err := db.QueryRow(fmt.Sprintf(`SELECT COUNT(%s) FROM users`, columnName)).Scan(
 		&found)
-	return err == nil
+	if err != nil {
+		return false
+	}
+	return true
 }
 
 func (h databaseHandler) GetBackend() config.Backend {
@@ -181,7 +184,7 @@ func (h databaseHandler) FindGroup(groupName string) (f bool, g config.Group, er
 	found := false
 
 	err = h.database.cnx.QueryRow(fmt.Sprintf(`
-			SELECT g.gidnumber FROM ldapgroups g WHERE lower(name)=%s`, h.sqlBackend.GetPrepareSymbol()), groupName).Scan(
+			SELECT g.gidnumber FROM groups g WHERE lower(name)=%s`, h.sqlBackend.GetPrepareSymbol()), groupName).Scan(
 		&group.GIDNumber)
 	if err == nil {
 		found = true
@@ -310,10 +313,10 @@ func (h databaseHandler) commaListToStringTable(commaList string) []string {
 func (h databaseHandler) memoizeGroups() ([]config.Group, error) {
 	workMemGroups := make([]*config.Group, 0)
 	rows, err := h.database.cnx.Query(`
-		SELECT g1.name,g1.gidnumber,ig.includegroupid 
-		FROM ldapgroups g1 
+		SELECT g1.name,g1.gidnumber,ig.includegroupid
+		FROM groups g1 
 		LEFT JOIN includegroups ig ON g1.gidnumber=ig.parentgroupid 
-		LEFT JOIN ldapgroups g2 ON ig.includegroupid=g2.gidnumber`)
+		LEFT JOIN groups g2 ON ig.includegroupid=g2.gidnumber`)
 	if err != nil {
 		return nil, errors.New("Unable to memoize groups list")
 	}