From e12c1319b605dea2074ad521b0b74f869da67de4 Mon Sep 17 00:00:00 2001
From: Dmitry Wagin <dmitry.wagin@ya.ru>
Date: Mon, 16 Dec 2019 16:37:00 +0300
Subject: [PATCH] Change default server-unix-socket-mode 755 -> 660 (#1423)

---
 CHANGELOG.md            | 1 +
 src/PostgREST/Config.hs | 6 +++---
 test/SpecHelper.hs      | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81878c5a7..562cb2463 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 - #1385, bulk RPC call now should be done by specifying a `Prefer: params=multiple-objects` header - @steve-chavez
 - #1401, resource embedding now outputs an error when multiple relationships between two tables are found - @steve-chavez
+- #1423, default Unix Socket file mode from 755 to 660 - @dwagin
 
 ## [6.0.2] - 2019-08-22
 
diff --git a/src/PostgREST/Config.hs b/src/PostgREST/Config.hs
index 74deb825f..a4500ea38 100644
--- a/src/PostgREST/Config.hs
+++ b/src/PostgREST/Config.hs
@@ -177,7 +177,7 @@ readOptions = do
     parseSocketFileMode :: C.Key -> C.Parser C.Config (Either Text FileMode)
     parseSocketFileMode k =
       C.optional k C.string >>= \case
-        Nothing -> pure $ Right 493 -- return default 755 mode if no value was provided
+        Nothing -> pure $ Right 432 -- return default 660 mode if no value was provided
         Just fileModeText ->
           case (readOct . unpack) fileModeText of
             []              ->
@@ -267,8 +267,8 @@ readOptions = do
           |## if specified it takes precedence over server-port
           |# server-unix-socket = "/tmp/pgrst.sock"
           |## unix socket file mode
-          |## when none is provided, 755 is applied by default
-          |# server-unix-socket-mode = "755"
+          |## when none is provided, 660 is applied by default
+          |# server-unix-socket-mode = "660"
           |
           |## base url for swagger output
           |# server-proxy-uri = ""
diff --git a/test/SpecHelper.hs b/test/SpecHelper.hs
index d57a501e7..20eff96f5 100644
--- a/test/SpecHelper.hs
+++ b/test/SpecHelper.hs
@@ -66,8 +66,8 @@ _baseCfg =  -- Connection Settings
   AppConfig mempty "postgrest_test_anonymous" Nothing "test" "localhost" 3000
             -- No user configured Unix Socket
             Nothing
-            -- No user configured Unix Socket file mode (defaults to 755)
-            (Right 493)
+            -- No user configured Unix Socket file mode (defaults to 660)
+            (Right 432)
             -- Jwt settings
             (Just $ encodeUtf8 "reallyreallyreallyreallyverysafe") False Nothing
             -- Connection Modifiers