Skip to content
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

Jump to bottom

Forward ssh-agent data between ssh-agent and RDP #4122

Merged
merged 7 commits into from
Nov 13, 2017
Merged

Forward ssh-agent data between ssh-agent and RDP #4122

merged 7 commits into from
Nov 13, 2017

Commits on Nov 10, 2017

  1. Forward ssh-agent data between ssh-agent and RDP 

    Add the sshagent plugin to forward the ssh-agent protocol over an RDP
dynamic virtual channel, just as the normal ssh-agent forwards it over
an SSH channel.  Add the "/ssh-agent" command line option to enable it.
Usage:

Run FreeRDP with the ssh-agent plugin enabled:

   xfreerdp /ssh-agent ...

In the remote desktop session run xrdp-ssh-agent and evaluate the output
in the shell as for ssh-agent to set the required environment variables
(specifically $SSH_AUTH_SOCK):

   eval "$(xrdp-ssh-agent -s)"

This is the same as for the normal ssh-agent.  You would typically do
this in your Xsession or /etc/xrdp/startwm.sh.

Limitations:

1. Error checking and handling could be improved.

2. This is only tested on Linux and will only work on systems where
clients talk to the ssh-agent via Unix domain sockets.  It won't
currently work on Windows but it could be ported.
    @ben-cohen
    ben-cohen committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    0e90841 View commit details
    Browse the repository at this point in the history

  2. Fix socket fd leak and other changes 

    1. In connect_to_sshagent() if connect() fails, the socket agent_fd is
   leaked.  It needs to be closed before returning.

2. Fix copyright messages.

3. Make if statement with call to CreateThread() clearer to read.
    @ben-cohen
    ben-cohen committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    7e26221 View commit details
    Browse the repository at this point in the history

  3. Remove EAGAIN/EWOULDBLOCK from blocking read/write

    @ben-cohen
    ben-cohen committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    6399308 View commit details
    Browse the repository at this point in the history

  4. Add rdpcontext so read thread can report channel error 

    Also fix copyright dates...
    @ben-cohen
    ben-cohen committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    c27541e View commit details
    Browse the repository at this point in the history

  5. Add server side plugin [UNTESTED] 

    This is based on xrdpapi/xrdp-ssh-agent.c from xrdp PR FreeRDP#867.
    @ben-cohen
    ben-cohen committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    badb701 View commit details
    Browse the repository at this point in the history

  6. Fix comments at the start of these files and adjust copyrights

    @ben-cohen
    ben-cohen committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    6093ec6 View commit details
    Browse the repository at this point in the history

  7. Remove underscores from define in sshagent_main.h

    @ben-cohen
    ben-cohen committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    8d54945 View commit details
    Browse the repository at this point in the history