1 files changed, 45 insertions, 10 deletions
diff --git a/plugins/dotenv/dotenv.plugin.zsh b/plugins/dotenv/dotenv.plugin.zsh
index b701b5596..24f285df5 100644
--- a/plugins/dotenv/dotenv.plugin.zsh
+++ b/plugins/dotenv/dotenv.plugin.zsh
@@ -1,15 +1,50 @@
+## Settings
+
+# Filename of the dotenv file to look for
+: ${ZSH_DOTENV_FILE:=.env}
+
+# Path to the file containing allowed paths
+: ${ZSH_DOTENV_ALLOWED_LIST:="${ZSH_CACHE_DIR:-$ZSH/cache}/dotenv-allowed.list"}
+: ${ZSH_DOTENV_DISALLOWED_LIST:="${ZSH_CACHE_DIR:-$ZSH/cache}/dotenv-disallowed.list"}
+
+
+## Functions
+
 source_env() {
-  if [[ -f .env ]]; then
-    # test .env syntax
-    zsh -fn .env || echo 'dotenv: error when sourcing `.env` file' >&2
-
-    if [[ -o a ]]; then
-      source .env
-    else
-      set -a
-      source .env
-      set +a
+  if [[ -f $ZSH_DOTENV_FILE ]]; then
+    if [[ "$ZSH_DOTENV_PROMPT" != false ]]; then
+      local confirmation dirpath="${PWD:A}"
+
+      # make sure there is an (dis-)allowed file
+      touch "$ZSH_DOTENV_ALLOWED_LIST"
+      touch "$ZSH_DOTENV_DISALLOWED_LIST"
+
+      # early return if disallowed
+      if grep -q "$dirpath" "$ZSH_DOTENV_DISALLOWED_LIST" &>/dev/null; then
+        return;
+      fi
+
+      # check if current directory's .env file is allowed or ask for confirmation
+      if ! grep -q "$dirpath" "$ZSH_DOTENV_ALLOWED_LIST" &>/dev/null; then
+        # print same-line prompt and output newline character if necessary
+        echo -n "dotenv: found '$ZSH_DOTENV_FILE' file. Source it? ([Y]es/[n]o/[a]lways/n[e]ver) "
+        read -k 1 confirmation; [[ "$confirmation" != $'\n' ]] && echo
+
+        # check input
+        case "$confirmation" in
+          [nN]) return ;;
+          [aA]) echo "$dirpath" >> "$ZSH_DOTENV_ALLOWED_LIST" ;;
+          [eE]) echo "$dirpath" >> "$ZSH_DOTENV_DISALLOWED_LIST"; return ;;
+          *) ;; # interpret anything else as a yes
+        esac
+      fi
     fi
+
+    # test .env syntax
+    zsh -fn $ZSH_DOTENV_FILE || echo "dotenv: error when sourcing '$ZSH_DOTENV_FILE' file" >&2
+
+    setopt localoptions allexport
+    source $ZSH_DOTENV_FILE
   fi
 }