Prepare to dockerize service

Add configuration over config file and ENV/ops

Signed-off-by: Artur Troian <[email protected]>

.gitignore

@@ -42,4 +42,5 @@ examples/tcp/persist.db
 coverage.txt
 vendor
 
-persist.db
+persist.db
+plugins

Dockerfile

@@ -0,0 +1,18 @@
+FROM golang:1.10.0
+
+ENV \
+    VOLANTMQ_WORK_DIR=/var/lib/volantmq \
+    VOLANTMQ_BUILD_FLAGS=""
+
+# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
+RUN groupadd -r volantmq && useradd -r -d ${VOLANTMQ_WORK_DIR} -m -g volantmq volantmq
+
+# Create environment directory
+ENV PATH /usr/lib/rabbitmq/bin:$PATH
+
+RUN mkdir ${VOLANTMQ_WORK_DIR}/{plugins,logs}
+
+# default config uses mqtt:1883
+EXPOSE 1883
+
+CMD ["volantmq"]

auth.go

@@ -0,0 +1,22 @@
+package main
+
+import vlAuth "github.com/VolantMQ/auth"
+
+type internalAuth struct {
+	creds map[string]string
+}
+
+// nolint: golint
+func (a internalAuth) Password(user, password string) vlAuth.Status {
+	if hash, ok := a.creds[user]; ok {
+		if password == hash {
+			return vlAuth.StatusAllow
+		}
+	}
+	return vlAuth.StatusDeny
+}
+
+// nolint: golint
+func (a internalAuth) ACL(clientID, user, topic string, access vlAuth.AccessType) vlAuth.Status {
+	return vlAuth.StatusAllow
+}

auth/basic.go

@@ -1,9 +1,9 @@
 package auth
 
-type Simple interface {
-	Password(u, p string) Status
-}
-
-type Anonymous interface {
-	Is() Status
-}
+//type Simple interface {
+//	Password(u, p string) Status
+//}
+//
+//type Anonymous interface {
+//	Is() Status
+//}

auth/manager.go

@@ -3,18 +3,19 @@ package auth
 import (
 	"errors"
 	"fmt"
-	"strings"
+
+	"github.com/VolantMQ/auth"
 )
 
 // Manager auth
 type Manager struct {
-	p []Provider
+	p []auth.Provider
 }
 
-var providers = make(map[string]Provider)
+var providers = make(map[string]auth.Provider)
 
 // Register auth provider
-func Register(name string, provider Provider) error {
+func Register(name string, provider auth.Provider) error {
 	if name == "" && provider == nil {
 		return errors.New("invalid args")
 	}
@@ -34,11 +35,10 @@ func UnRegister(name string) {
 }
 
 // NewManager new auth manager
-func NewManager(p string) (*Manager, error) {
+func NewManager(p []string) (*Manager, error) {
 	m := Manager{}
 
-	list := strings.Split(p, ";")
-	for _, pa := range list {
+	for _, pa := range p {
 		pvd, ok := providers[pa]
 		if !ok {
 			return nil, fmt.Errorf("session: unknown provider %q", pa)
@@ -51,23 +51,23 @@ func NewManager(p string) (*Manager, error) {
 }
 
 // Password authentication
-func (m *Manager) Password(user, password string) Status {
+func (m *Manager) Password(user, password string) auth.Status {
 	for _, p := range m.p {
-		if status := p.Password(user, password); status == StatusAllow {
+		if status := p.Password(user, password); status == auth.StatusAllow {
 			return status
 		}
 	}
 
-	return StatusDeny
+	return auth.StatusDeny
 }
 
 // ACL check permissions
-func (m *Manager) ACL(clientID, user, topic string, access AccessType) Status {
+func (m *Manager) ACL(clientID, user, topic string, access auth.AccessType) auth.Status {
 	for _, p := range m.p {
-		if status := p.ACL(clientID, user, topic, access); status == StatusAllow {
+		if status := p.ACL(clientID, user, topic, access); status == auth.StatusAllow {
 			return status
 		}
 	}
 
-	return StatusDeny
+	return auth.StatusDeny
 }