Unverified Commit abdf7925 authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #214 from nikhildoifode/na-1253 

Modified couchdb authentication process
parents a38ec54d 4be9e99b

charts/couchdb/values.yaml

+2 −2
Original line number Diff line number Diff line
@@ -192,8 +192,8 @@ couchdbConfig: 
    # 5984 when is set to true.

    require_valid_user: false

  couch_httpd_auth:

    # Setting default timeout to 365 days (365*24*60*60)

    timeout: 31536000

    # Setting default timeout to 20 min (20*60)

    timeout: 1200

    require_valid_user: true

    allow_persistent_cookies: true

go-packages/meep-couch/db.go

+21 −4
Original line number Diff line number Diff line
@@ -18,10 +18,11 @@ package couchdb 


import (

	"context"

	"strings"

	"time"



	"github.com/flimzy/kivik"

	_ "github.com/go-kivik/couchdb"

	"github.com/go-kivik/couchdb/chttp"



	log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger"

)
@@ -42,6 +43,16 @@ type Connector struct { 
	dbHandle *kivik.DB

}



func authenticateConnection(dbClient *kivik.Client) {

	for {

		time.Sleep(10 * time.Minute)

		err := dbClient.Authenticate(context.TODO(), &chttp.CookieAuth{Username: "admin", Password: "admin"})

		if err != nil {

			log.Debug("Re-Authentication failed", err)

		}

	}

}



// NewConnector - Creates and initialize a CouchDB connector to a database

func NewConnector(addr string, dbName string) (rc *Connector, err error) {

	rc = new(Connector)
@@ -56,12 +67,18 @@ func NewConnector(addr string, dbName string) (rc *Connector, err error) { 
			c.addr = addr

		}



		var address []string = strings.SplitAfter(addr, "http://")

		var newAddr = address[0] + "admin:admin@" + address[1]

		c.dbClient, err = kivik.New(context.TODO(), "couch", newAddr)

		c.dbClient, err = kivik.New(context.TODO(), "couch", addr)

		if err != nil {

			return nil, err

		}



		err = c.dbClient.Authenticate(context.TODO(), &chttp.CookieAuth{Username: "admin", Password: "admin"})

		if err != nil {

			return nil, err

		}



		go authenticateConnection(c.dbClient)



		client = c

	}