@@ -28,10 +28,11 @@

                                (:file "aws-dispatcher")

                                (:file "domain")

                                (:file "objc-utils")

+                               (:file "read-credentials")

+                               (:file "credential-provider")

                                (:file "mfa-tool")

                                (:file "stack-store")

                                (:file "stack")

-                               (:file "credential-provider")

                                (:file "capi-interface")))))

 (defsystem :aws-access/tests

@@ -185,30 +185,14 @@

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

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

     (prin1 (mapcar 'restart-name

-                   (compute-restarts condition) )

+                   (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)))

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

+  (abort))

 (defun main ()

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

@@ -2,7 +2,8 @@

   (:use :cl )

   (:export #:make-aws-session

            #:debug-provider

-           #:setup-default-chain))

+           #:setup-default-chain

+           #:save-ubiquitous-credentials))

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

 (defstruct hash-ref name hash-table)

@@ -93,14 +94,16 @@

      :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)

+  (prog1 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 :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)))

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

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

+    (ubiquitous:offload)))

 (defun make-aws-session ()

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

@@ -120,6 +120,10 @@

           (values signin-token

                   parser))))))

+(defun set-aws-credentials (access-key-id secret-access-key &optional condition)

+  (alexandria:when-let ((restart (find-restart 'set-aws-credentials condition)))

+    (invoke-restart restart access-key-id secret-access-key)))

+

 (defun open-url (url)

   (capi:contain (make-instance 'capi:browser-pane

                                :url url)

@@ -1,7 +1,6 @@

 (in-package :mfa-tool)

 (defun account-selected (account)

-  (format t "~s" account)

   (setf (ubiquitous:value :default-account)

         (cdr account)))

@@ -25,6 +24,26 @@

   (credentials-for-account interface

                            (current-account interface)))

+

+(defmethod mfa-tool.store:execute ((store (eql :mfa-tool.debugger))

+                                   (action mfa-tool.read-credentials:credential-update))

+  (with-accessors ((access-key mfa-tool.read-credentials:access-key)

+                   (secret-access-key mfa-tool.read-credentials:secret-access-key)) action

+    (mfa-tool.credential-provider:save-ubiquitous-credentials

+     (aws-sdk:make-credentials :access-key-id access-key

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

+                               :session-token nil))))

+

+(defun authenticate (account user-name token)

+  (handler-bind ((aws-sdk:no-credentials

+                   (lambda (c)

+                     (alexandria:when-let

+                         ((result (mfa-tool.read-credentials:prompt-for-aws-credentials :mfa-tool.debugger)))

+                       (set-aws-credentials (mfa-tool.read-credentials:access-key result)

+                                            (mfa-tool.read-credentials:secret-access-key result)

+                                            c)))))

+    (run-process account user-name token)))

+

 (defun go-on (_ interface)

   (declare (ignore _))

   (let ((token (capi:text-input-pane-text (mfa-input interface)))

@@ -47,19 +66,20 @@

                                                 new-code)

                                           (change-mfa-token new-code))

                                    (capi:abort-callback)))))))

-          (run-process account user-name token))

+          (authenticate account user-name token))

       (with-open-file (stream (make-pathname :name ""

                                              :type "cj-aws"

                                              :defaults (user-homedir-pathname))

                               :direction :output

                               :if-exists :rename

                               :if-does-not-exist :create)

-        (format (make-broadcast-stream stream

-                                       (capi:collector-pane-stream (output interface)))

-                "export AWS_ACCESS_KEY_ID='~a'~%export AWS_SECRET_ACCESS_KEY='~a'~%export AWS_SESSION_TOKEN='~a'~%"

-                (session-id creds)

-                (session-key creds)

-                (session-token creds)))

+        (let ((cred-stream (make-broadcast-stream stream

+                                                  (capi:collector-pane-stream (output interface)))))

+          (format cred-stream

+                  "export AWS_ACCESS_KEY_ID='~a'~%export AWS_SECRET_ACCESS_KEY='~a'~%export AWS_SESSION_TOKEN='~a'~%"

+                  (session-id creds)

+                  (session-key creds)

+                  (session-token creds))))

       (capi:set-button-panel-enabled-items (slot-value interface 'action-buttons)

                                            :set t)

       (setf (credentials-for-account interface account) (session-credentials creds)

new file mode 100644

@@ -0,0 +1,130 @@

+(defpackage :mfa-tool.read-credentials

+  (:use :cl)

+  (:export #:access-key

+           #:secret-access-key

+           #:credential-update

+           #:prompt-for-aws-credentials))

+(in-package :mfa-tool.read-credentials)

+

+(defvar *store*)

+

+(defun column (attrs &rest children)

+  (apply 'make-instance 'capi:column-layout

+         :children children

+         attrs))

+

+(defun row (attrs &rest children)

+  (apply 'make-instance 'capi:row-layout

+         :children children

+         attrs))

+

+(defun dispatch-with-action-creator (action-creator)

+  (let ((store *store*))

+    (lambda (data)

+      (mfa-tool.store:dispatch store

+                               (funcall action-creator data)))))

+

+(defun dispatch-with-item (store)

+  (lambda (data)

+    (mfa-tool.store:dispatch store data)))

+

+(defun list-panel (action attrs items)

+  (apply 'make-instance 'capi:list-panel

+         :items items

+         :selection-callback (dispatch-with-action-creator action)

+         :callback-type :data

+         attrs))

+

+(defun select (action attrs items)

+  (apply 'make-instance 'capi:option-pane

+         :items items

+         :selection-callback (dispatch-with-action-creator action)

+         :callback-type :data

+         attrs))

+

+(defun text-input (action attrs &optional (text ""))

+  (apply 'make-instance 'capi:text-input-pane

+         :text text

+         :change-callback (dispatch-with-action-creator action)

+         attrs))

+

+(defun button-panel (attrs &rest items)

+  (apply 'make-instance 'capi:push-button-panel

+         :items items

+         :selection-callback (dispatch-with-item *store*)

+         :callback-type :data

+         attrs))

+

+(defclass update-access-key ()

+  ((%key :initarg :key :reader key)))

+(defun update-access-key (key)

+  (fw.lu:new 'update-access-key key))

+

+(defclass update-secret-access-key ()

+  ((%key :initarg :key :reader key)))

+(defun update-secret-access-key (key)

+  (fw.lu:new 'update-secret-access-key key))

+

+(defun layout ()

+  (column ()

+          (make-instance 'capi:grid-layout

+                         :x-adjust :right

+                         :y-adjust :center

+                         :description

+                         (list "Access Key:"

+                               (text-input 'update-access-key

+                                           ())

+

+                               "Secret Access Key:"

+                               (text-input 'update-secret-access-key

+                                           (list :min-width '(:character 45)

+                                                 :callback-type nil

+                                                 :callback (alexandria:compose

+                                                            (dispatch-with-item *store*)

+                                                            (lambda () :|Ok|))))))

+          (row ()

+               nil

+               (button-panel '(:default-button  :|Ok|

+                               :cancel-button   :|Cancel|

+                               :accepts-focus-p t)

+                             :|Cancel|

+                             :|Ok|))))

+

+

+(defclass credential-input-store (mfa-tool.store:store)

+  ((access-key :accessor access-key)

+   (secret-access-key :accessor secret-access-key)

+   (%done-cb :writer bind :reader done-callback)))

+(defun done-callback-p (store)

+  (slot-boundp store '%done-cb))

+

+(fw.lu:defclass+ credential-update ()

+  ((access-key :reader access-key :initarg :access-key)

+   (secret-access-key :accessor secret-access-key :initarg :secret-access-key)))

+

+(defmethod mfa-tool.store:execute ((store credential-input-store) (action update-access-key))

+  (setf (access-key store) (key action)))

+(defmethod mfa-tool.store:execute ((store credential-input-store) (action update-secret-access-key))

+  (setf (secret-access-key store) (key action)))

+

+(defmethod print-object ((object credential-update) s)

+  (print-unreadable-object (object s :type t :identity t)

+    (format s "~s ~s"

+            (access-key object)

+            (secret-access-key object))))

+

+(defmethod mfa-tool.store:dispatch :after ((store credential-input-store) (action (eql :|Ok|)))

+  (fw.lu:with-accessors* (access-key secret-access-key) store

+    (let ((credential-update (credential-update access-key secret-access-key)))

+      (mfa-tool.store:propagate store credential-update)

+      (capi:exit-dialog credential-update))))

+

+(defmethod mfa-tool.store:dispatch :after ((store credential-input-store) (action (eql :|Cancel|)))

+  (capi:abort-dialog))

+

+(defun prompt-for-aws-credentials (next-store)

+  (let* ((*store* (make-instance 'credential-input-store :next-store next-store))

+         (interface (make-instance 'capi:interface

+                                   :layout (layout)

+                                   :title "Enter Credentials")))

+    (capi:display-dialog interface)))

@@ -1,20 +1,33 @@

 (defpackage :mfa-tool.store

   (:use :cl)

-  (:export #:store #:execute #:dispatch))

+  (:export #:store #:execute #:dispatch

+           #:next-store

+           #:next-store-p

+           #:propagate))

 (in-package :mfa-tool.store)

 (defclass store ()

-  ())

+  ((%next-store :initarg :next-store :reader next-store)))

+(defun next-store-p (store)

+  (slot-boundp store '%next-store))

 (defgeneric execute (store action)

   (:argument-precedence-order action store)

   (:method :around (store action)

-   (call-next-method)

-   store)

+    (call-next-method)

+    store)

   (:method (store action)

-   store))

+    store))

 (defgeneric dispatch (store action)

   (:argument-precedence-order action store)

   (:method ((store store) action)

-   (execute store action)))

\ No newline at end of file

+    (execute store action))

+  (:method ((store symbol) action)

+    (execute store action)))

+

+(defun propagate (store action)

+  (when (next-store-p store)

+    (dispatch (next-store store)

+              action))

+  store)