@@ -22,7 +22,8 @@

                                       0 7)

                               (uiop:run-program (list "zsh" "scripts/dirty-tag") :output :string)))

          0

-         :KEEP-PRETTY-PRINTER t

+         :keep-conditions :all

+         :keep-pretty-printer t

          :interface :capi

          :keep-modules t

          :packages-to-keep-symbol-names '(:mfa-tool)

@@ -169,7 +169,7 @@

 (defun run (&optional accounts)

   (setf *print-readably* nil

         *accounts* (reprocess-accounts (load-accounts accounts))

-        aws:*session* (fwoar.credential-provider:make-aws-session))

+        aws:*session* (mfa-tool.credential-provider:make-aws-session))

   (ubiquitous:restore :cj.mfa-tool)

   (interface :default-account 

              (ubiquitous:value :default-account)))

@@ -179,20 +179,42 @@

                                                         :type "json")))

   (run accounts))

-(eval-when (:compile-toplevel :load-toplevel :execute)

-  (defun debugging (condition fun)

-    (declare (ignore fun))

-    (let ((*print-readably* nil)

-          (out (make-instance 'capi:collector-pane)))

-      (princ condition (capi:collector-pane-stream out))

-      (prin1 (mapcar 'restart-name

-                     (compute-restarts condition) )

-             (capi:collector-pane-stream out))

-      (capi:contain out)

-      (abort))))

+(defun debugging (condition fun)

+  (declare (ignore fun))

+  (let ((*print-readably* nil)

+        (out (make-instance 'capi:collector-pane)))

+    (princ condition (capi:collector-pane-stream out))

+    (prin1 (mapcar 'restart-name

+                   (compute-restarts condition) )

+           (capi:collector-pane-stream out))

+    (typecase condition

+      (aws-sdk:no-credentials

+       (fresh-line (capi:collector-pane-stream out))

+       (format (capi:collector-pane-stream out) "Credentials file ~:[doesn't~;does~] exist for me~%"

+               (probe-file (merge-pathnames ".aws/credentials"

+                                            (user-homedir-pathname))))

+       (when (probe-file (merge-pathnames ".aws/credentials"

+                                          (user-homedir-pathname)))

+         (princ (alexandria:read-file-into-string (merge-pathnames ".aws/credentials"

+                                                                   (user-homedir-pathname)))

+                (capi:collector-pane-stream out)))

+       (terpri (capi:collector-pane-stream out))

+       (mfa-tool.credential-provider:debug-provider (capi:collector-pane-stream out))

+       (terpri (capi:collector-pane-stream out))

+       (terpri)

+       ))

+    (dbg:output-backtrace :stream (capi:collector-pane-stream out))

+    (terpri)

+    (terpri)

+    (capi:contain out)

+    (dbg:log-bug-form "fail")

+    (abort)))

 (defun main ()

+  (mfa-tool.credential-provider:setup-default-chain)

+  (mfa-tool.pprint-setup:setup-pprint)

   (setf *debugger-hook* 'debugging)

   (capi:set-application-interface (make-instance 'my-app-interface))

   (show-splash)

+  (princ (user-homedir-pathname) *standard-output*)

   (run))

@@ -1,8 +1,9 @@

-(defpackage :fwoar.credential-provider

+(defpackage :mfa-tool.credential-provider

   (:use :cl )

-  (:export

-   #:make-aws-session))

-(in-package :fwoar.credential-provider)

+  (:export #:make-aws-session

+           #:debug-provider

+           #:setup-default-chain))

+(in-package :mfa-tool.credential-provider)

 (defstruct hash-ref name hash-table)

 (defstruct leaf name value)

@@ -54,8 +55,7 @@

                                        :my-builder)))

 (defclass fwoar-provider (aws-sdk/credentials/base:provider)

-  ((file :initarg :file

-     :initform #P"~/.aws/credentials")

+  ((file :initarg :file :initform (error "must pass a file name"))

    (profile :initarg :profile

             :initform aws-sdk:*aws-profile*

             :accessor provider-profile)

@@ -69,7 +69,7 @@

                (parse-ini file)))))

 (defmethod aws-sdk/credentials/base:retrieve ((provider fwoar-provider))

-  (with-slots (retrievedp file) provider

+  (with-slots (retrievedp) provider

     (setf retrievedp nil)

     (let ((section (read-credentials provider)))

       (when section

@@ -80,8 +80,43 @@

          :session-token (gethash "aws_session_token" section)

          :provider-name "fwoar-provider")))))

+(defclass ubiquitous-provider (aws-sdk/credentials/base:provider)

+  ((retrievedp :initform nil)))

+

+(defmethod aws-sdk/credentials/base:retrieve ((provider ubiquitous-provider))

+  (when (and (ubiquitous:value :aws :access-key-id)

+             (ubiquitous:value :aws :secret-access-key))

+    (aws-sdk:make-credentials

+     :access-key-id (ubiquitous:value :aws :access-key-id)

+     :secret-access-key (ubiquitous:value :aws :secret-access-key)

+     :session-token (ubiquitous:value :aws :session-token)

+     :provider-name "ubiquitous-provider")))

+

+(defun save-ubiquitous-credentials (credentials)

+  (setf (ubiquitous:value :aws :access-key-id)

+        (aws-sdk/credentials/base:credentials-access-key-id credentials)

+

+        (ubiquitous:value :aws :secret-access-key)

+        (aws-sdk/credentials/base:credentials-secret-access-key credentials)

+

+        (ubiquitous:value :aws :session-token)

+        (aws-sdk/credentials/base:credentials-session-token credentials)))

+

 (defun make-aws-session ()

   (let ((aws-sdk/credentials::*chained-providers*

-          (list* (make-instance 'fwoar-provider)

-                 aws-sdk/credentials::*chained-providers*)))

+          (list (make-instance 'fwoar-provider :file (merge-pathnames ".aws/credentials"

+                                                                      (user-homedir-pathname)))

+                (make-instance 'ubiquitous-provider))))

     (aws:make-session :credentials (aws:default-aws-credentials))))

+

+(defun debug-provider (s)

+  (pprint (read-credentials (make-instance 'fwoar-provider

+                                           :file (merge-pathnames ".aws/credentials"

+                                                                  (user-homedir-pathname))))

+          s))

+

+(defun setup-default-chain ()

+  (setf aws-sdk/credentials::*chained-providers*

+        (list (make-instance 'fwoar-provider :file (merge-pathnames ".aws/credentials"

+                                                                    (user-homedir-pathname)))

+              (make-instance 'ubiquitous-provider))))

@@ -97,11 +97,12 @@

   (loop

     (restart-bind ((set-aws-credentials (lambda (access-key-id secret-access-key)

                                           (setf aws:*session*

-                                                (aws:make-session :credentials (aws:make-credentials

-                                                                                :access-key-id access-key-id

-                                                                                :secret-access-key secret-access-key

-                                                                                :session-token nil

-                                                                                :provider-name "restart-provider")))

+                                                (aws:make-session

+                                                 :credentials (aws:make-credentials

+                                                               :access-key-id access-key-id

+                                                               :secret-access-key secret-access-key

+                                                               :session-token nil

+                                                               :provider-name "restart-provider")))

                                           (continue))

                                         :interactive-function 'read-new-aws-credentials

                                         :report-function (lambda (s)