yesod 1.4.1.5 → 1.4.2

raw patch · 3 files changed

+20/−4 lines, 3 files

Files

• ChangeLog.md +4/−0
• Yesod/Default/Config2.hs +15/−3
• yesod.cabal +1/−1

@@ -1,3 +1,7 @@+## 1.4.2++* Do not parse string environment variables into numbers/booleans [#1061](https://github.com/yesodweb/yesod/issues/1061)+ ## 1.4.1  Provide the `Yesod.Default.Config2` module, for use by newer scaffoldings.

@@ -69,11 +69,23 @@     goV (String t1) = fromMaybe (String t1) $ do         t2 <- T.stripPrefix "_env:" t1         let (name, t3) = T.break (== ':') t2+            mdef = fmap parseValue $ T.stripPrefix ":" t3         Just $ case H.lookup name env of-            Just val -> parseValue val+            Just val ->+                -- If the default value parses as a String, we treat the+                -- environment variable as a raw value and do not parse it.+                -- This means that things like numeric passwords just work.+                -- However, for originally numerical or boolean values (e.g.,+                -- port numbers), we still perform a normal YAML parse.+                --+                -- For details, see:+                -- https://github.com/yesodweb/yesod/issues/1061+                case mdef of+                    Just (String _) -> String val+                    _ -> parseValue val             Nothing ->-                case T.stripPrefix ":" t3 of-                    Just val | not requireEnv' -> parseValue val+                case mdef of+                    Just val | not requireEnv' -> val                     _ -> Null     goV v = v 

@@ -1,5 +1,5 @@ name:            yesod-version:         1.4.1.5+version:         1.4.2 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>