Push <- Release/v6.1.18

.github/workflows/ci.yml

@@ -2,12 +2,13 @@ name: CI
 on: [push, pull_request]
 env:
   go-version: '1.14.x'
+  postgis-version: '2.5'
 jobs:
   test:
     name: Test
     strategy:
       matrix:
-        pg-version: ['10', '11']
+        pg-version: ['11', '12']
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
@@ -19,26 +20,32 @@ jobs:
         redis version: '5'
 
     - name: Install PostgreSQL
-      uses: nyaruka/postgis-action@master
+      uses: nyaruka/postgis-action@v2
       with:
         postgresql version: ${{ matrix.pg-version }}
+        postgis version: ${{ env.postgis-version }}
+        postgresql password: temba
 
     - name: Install Linux packages
       run: sudo apt install -y --no-install-recommends postgresql-client
 
     - name: Initialize database
+      # we create our test database with a different user so that we can drop everything owned by this user between tests
       run: |
-        psql -h localhost -U postgres -c "CREATE USER mailroom_test PASSWORD 'temba';"
-        psql -h localhost -U postgres -c "ALTER ROLE mailroom_test WITH SUPERUSER;"
-        psql -h localhost -U postgres -c "CREATE DATABASE mailroom_test;"
+        export PGPASSWORD=temba
+        psql -h localhost -U postgres --no-password -c "CREATE USER mailroom_test PASSWORD 'temba';"
+        psql -h localhost -U postgres --no-password -c "ALTER ROLE mailroom_test WITH SUPERUSER;"
+        psql -h localhost -U postgres --no-password -c "CREATE DATABASE mailroom_test;"
 
     - name: Install Go
       uses: actions/setup-go@v1
       with:
         go-version: ${{ env.go-version }}
 
     - name: Run tests
-      run: go test -p=1 -coverprofile=coverage.text -covermode=atomic ./...
+      run: |
+        export PGPASSWORD=temba
+        go test -p=1 -coverprofile=coverage.text -covermode=atomic ./...
 
     - name: Upload coverage
       if: success()
@@ -59,7 +66,7 @@ jobs:
       # for backward compatibility, English docs are copied to root of docs directory
       run: |
         GOFLOW_VERSION=$(grep goflow go.mod | cut -d" " -f2 | cut -c2-)
-        curl https://codeload.github.com/nyaruka/goflow/tar.gz/v$GOFLOW_VERSION | tar --wildcards --strip=1 -zx "goflow-${GOFLOW_VERSION}/docs/*"
+        curl -L https://github.com/nyaruka/goflow/releases/download/v${GOFLOW_VERSION}/docs.tar.gz | tar zxv
         cp ./docs/en-us/*.* docs/
 
     - name: Install Go

CHANGELOG.md

@@ -1,3 +1,62 @@
+v6.1.18
+----------
+ * Update to latest goflow
+ * Rename tickets/internal package
+
+v6.1.17
+----------
+ * Should match referral trigger with case insensitive
+
+v6.1.16
+----------
+ * Update to latest goflow
+ * Add link local ips to default disallowed networks config
+
+v6.1.15
+----------
+ * Update phonenumbers lib
+ * Decrease locations cache timeout to 1 minute
+
+v6.1.14
+----------
+ * Support ElasticSearch 7.2 (backwards incompatible to Elastic 6.*)
+
+v6.1.13
+----------
+ * Update to latest goflow
+
+v6.1.12
+----------
+ * Update to latest goflow v0.110.0
+
+v6.1.11
+----------
+ * Update to latest goflow v0.109.4
+
+v6.1.10
+----------
+ * Simplify FCM client code
+ * Fix updating message status when id column is bigint
+ * Ensure courier messages are always queued for a single contact
+ * Fix not triggering FCM syncs for broadcasts and ticket reply messages
+
+v6.1.9
+----------
+ * Update to goflow v0.109.0
+
+v6.1.8
+----------
+ * Update to latest goflow 0.108.0
+
+v6.1.7
+----------
+ * Use background instead of passive
+
+v6.1.6
+----------
+ * Update to latest goflow v0.107.2
+ * Add support for passive flows
+
 v6.1.5
 ----------
  * Update to goflow v0.107.1

cmd/mailroom/main.go

@@ -27,6 +27,7 @@ import (
 	_ "github.com/nyaruka/mailroom/core/tasks/starts"
 	_ "github.com/nyaruka/mailroom/core/tasks/stats"
 	_ "github.com/nyaruka/mailroom/core/tasks/timeouts"
+	_ "github.com/nyaruka/mailroom/services/tickets/intern"
 	_ "github.com/nyaruka/mailroom/services/tickets/mailgun"
 	_ "github.com/nyaruka/mailroom/services/tickets/rocketchat"
 	_ "github.com/nyaruka/mailroom/services/tickets/zendesk"

config/config.go

@@ -84,7 +84,7 @@ func NewMailroomConfig() *Config {
 		WebhooksInitialBackoff: 5000,
 		WebhooksBackoffJitter:  0.5,
 		SMTPServer:             "",
-		DisallowedNetworks:     `127.0.0.1,::1,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16`,
+		DisallowedNetworks:     `127.0.0.1,::1,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,169.254.0.0/16,fe80::/10`,
 		MaxStepsPerSprint:      100,
 		MaxValueLength:         640,
 

config/config_test.go

@@ -16,11 +16,14 @@ func TestParseDisallowedNetworks(t *testing.T) {
 	privateNetwork2 := &net.IPNet{IP: net.IPv4(172, 16, 0, 0).To4(), Mask: net.CIDRMask(12, 32)}
 	privateNetwork3 := &net.IPNet{IP: net.IPv4(192, 168, 0, 0).To4(), Mask: net.CIDRMask(16, 32)}
 
+	linkLocalIPv4 := &net.IPNet{IP: net.IPv4(169, 254, 0, 0).To4(), Mask: net.CIDRMask(16, 32)}
+	_, linkLocalIPv6, _ := net.ParseCIDR("fe80::/10")
+
 	// test with config defaults
 	ips, ipNets, err := cfg.ParseDisallowedNetworks()
 	assert.NoError(t, err)
 	assert.Equal(t, []net.IP{net.IPv4(127, 0, 0, 1), net.ParseIP(`::1`)}, ips)
-	assert.Equal(t, []*net.IPNet{privateNetwork1, privateNetwork2, privateNetwork3}, ipNets)
+	assert.Equal(t, []*net.IPNet{privateNetwork1, privateNetwork2, privateNetwork3, linkLocalIPv4, linkLocalIPv6}, ipNets)
 
 	// test with empty
 	cfg.DisallowedNetworks = ``

core/handlers/msg_created.go

@@ -25,7 +25,7 @@ func handlePreMsgCreated(ctx context.Context, tx *sqlx.Tx, rp *redis.Pool, oa *m
 	event := e.(*events.MsgCreatedEvent)
 
 	// we only clear timeouts on messaging flows
-	if scene.Session().SessionType() != models.MessagingFlow {
+	if scene.Session().SessionType() != models.FlowTypeMessaging {
 		return nil
 	}
 
@@ -73,12 +73,12 @@ func handleMsgCreated(ctx context.Context, tx *sqlx.Tx, rp *redis.Pool, oa *mode
 
 	// ignore events that don't have a channel or URN set
 	// TODO: maybe we should create these messages in a failed state?
-	if scene.Session().SessionType() == models.MessagingFlow && (event.Msg.URN() == urns.NilURN || event.Msg.Channel() == nil) {
+	if scene.Session().SessionType() == models.FlowTypeMessaging && (event.Msg.URN() == urns.NilURN || event.Msg.Channel() == nil) {
 		return nil
 	}
 
 	// messages in messaging flows must have urn id set on them, if not, go look it up
-	if scene.Session().SessionType() == models.MessagingFlow {
+	if scene.Session().SessionType() == models.FlowTypeMessaging {
 		urn := event.Msg.URN()
 		if models.GetURNInt(urn, "id") == 0 {
 			urn, err := models.GetOrCreateURN(ctx, tx, oa, scene.ContactID(), event.Msg.URN())
@@ -114,7 +114,7 @@ func handleMsgCreated(ctx context.Context, tx *sqlx.Tx, rp *redis.Pool, oa *mode
 	scene.AppendToEventPreCommitHook(hooks.CommitMessagesHook, msg)
 
 	// don't send messages for surveyor flows
-	if scene.Session().SessionType() != models.SurveyorFlow {
+	if scene.Session().SessionType() != models.FlowTypeSurveyor {
 		scene.AppendToEventPostCommitHook(hooks.SendMessagesHook, msg)
 	}
 

core/handlers/msg_received.go

@@ -22,7 +22,7 @@ func handleMsgReceived(ctx context.Context, tx *sqlx.Tx, rp *redis.Pool, oa *mod
 	event := e.(*events.MsgReceivedEvent)
 
 	// for surveyor sessions we need to actually create the message
-	if scene.Session() != nil && scene.Session().SessionType() == models.SurveyorFlow {
+	if scene.Session() != nil && scene.Session().SessionType() == models.FlowTypeSurveyor {
 		logrus.WithFields(logrus.Fields{
 			"contact_uuid": scene.ContactUUID(),
 			"session_id":   scene.SessionID(),