Skip to content

Support for libssh2_channel_request_auth_agent in with-ssh-connection macro #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
svetlyak40wt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for libssh2_channel_request_auth_agent in with-ssh-connection macro #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/libssh2-cffi.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,3 +818,10 @@
(with-foreign-strings (((fs-filename fs-filename-len) filename))
(result-or-error
(%libssh2-sftp-open-ex sftp fs-filename (- fs-filename-len 1) flags mode open-type))))

(defcfun ("libssh2_channel_request_auth_agent" %channel-request-auth-agent) +ERROR-CODE+
(session +session+))

(defun channel-request-auth-agent (session)
(let ((result (%channel-request-auth-agent session)))
(result-or-error result)))
1 change: 1 addition & 0 deletions src/package.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
:channel-send-eof
:channel-exit-status
:channel-scp-recv
:channel-request-auth-agent

;; SFTP
:sftp-list-directory
Expand Down
27 changes: 16 additions & 11 deletions src/streams.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,22 @@
(session-free (session ssh)))))

(defmacro with-ssh-connection (session (host auth-data &rest connection-args) &body body)
`(let* ((,session (create-ssh-connection ,host ,@connection-args))
(*ssh-connection* ,session))
(unwind-protect
(if (authentication ,session ,auth-data)
(handler-bind ((libssh2-invalid-error-code
(lambda (condition)
(declare (ignore condition))
(throw-last-error (session ,session)))))
,@body)
(error 'ssh-authentication-failure))
(destroy-ssh-connection ,session))))
(let ((forward-agent (getf connection-args :forward-agent)))
(alexandria:remove-from-plistf connection-args
:forward-agent)
`(let* ((,session (create-ssh-connection ,host ,@connection-args))
(*ssh-connection* ,session))
(unwind-protect
(if (authentication ,session ,auth-data)
(handler-bind ((libssh2-invalid-error-code
(lambda (condition)
(declare (ignore condition))
(throw-last-error (session ,session)))))
,@(when forward-agent
`((channel-request-auth-agent (session ,session))))
,@body)
(error 'ssh-authentication-failure))
(destroy-ssh-connection ,session)))))

(defmethod ssh-session-key ((ssh ssh-connection))
(session-hostkey (session ssh)))
Expand Down