diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-06-13 12:25:58 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-06-13 12:25:58 -0400 |
| commit | b93d6398d799376a572414a30d7b4f02beadd137 (patch) | |
| tree | 14378a31adb9c11fb2e995205af4ff254bfcc750 | |
| parent | ca5d2766c5c143a34b095c5dcb3c829285b2c28e (diff) | |
| parent | 3caa700a0443ab2499da42d32b3ffcd7039fc591 (diff) | |
Merge commit 'jrollins/master'
| -rw-r--r-- | debian/monkeysphere.manpages | 1 | ||||
| -rw-r--r-- | man/man1/monkeysphere-ssh-proxycommand.1 | 25 | ||||
| -rw-r--r-- | man/man1/monkeysphere.1 | 3 | ||||
| -rwxr-xr-x | src/monkeysphere | 5 |
4 files changed, 34 insertions, 0 deletions
diff --git a/debian/monkeysphere.manpages b/debian/monkeysphere.manpages index 6e2cb92..a8f6c16 100644 --- a/debian/monkeysphere.manpages +++ b/debian/monkeysphere.manpages @@ -1,3 +1,4 @@ man/man1/monkeysphere.1 man/man1/openpgp2ssh.1 +man/man1/monkeysphere-ssh-proxycommand.1 man/man8/monkeysphere-server.8 diff --git a/man/man1/monkeysphere-ssh-proxycommand.1 b/man/man1/monkeysphere-ssh-proxycommand.1 new file mode 100644 index 0000000..41a95aa --- /dev/null +++ b/man/man1/monkeysphere-ssh-proxycommand.1 @@ -0,0 +1,25 @@ +.TH MONKEYSPHERE-SSH-PROXYCOMMAND "1" "June 2008" "monkeysphere 0.1" "User Commands" +.SH NAME +monkeysphere-ssh-proxycommand \- MonkeySphere ssh ProxyCommand script +.PD +.SH SYNOPSIS +.B ssh -o ProxyCommand="monkeysphere-ssh-proxycommand %h %p" ... +.PD +.SH DESCRIPTION +.PP +MonkeySphere is a system to leverage the OpenPGP Web of Trust for ssh +authentication and encryption. OpenPGP keys are tracked via GnuPG, +and added to the ssh authorized_keys and known_hosts files to be used +for authentication and encryption of ssh connection. + +\fBmonkeysphere-ssh-proxy\fP is an ssh proxy command that can be used +to trigger a monkeysphere update of the known_hosts file for the hosts +that are being connected to. +.PD +.SH AUTHOR +Written by Jameson Rollins <jrollins@fifthhorseman.net> +.PD +.SH SEE ALSO +.BR monkeypshere (1), +.BR ssh (1), +.BR gpg (1) diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1 index 410a5d7..636adcb 100644 --- a/man/man1/monkeysphere.1 +++ b/man/man1/monkeysphere.1 @@ -1,8 +1,10 @@ .TH MONKEYSPHERE "1" "June 2008" "monkeysphere 0.1" "User Commands" .SH NAME monkeysphere \- MonkeySphere client user interface +.PD .SH SYNOPSIS .B monkeysphere \fIcommand\fP [\fIargs\fP] +.PD .SH DESCRIPTION .PP MonkeySphere is a system to leverage the OpenPGP Web of Trust for ssh @@ -102,6 +104,7 @@ Host keys cache directory. .PD .SH AUTHOR Written by Jameson Rollins <jrollins@fifthhorseman.net> +.PD .SH SEE ALSO .BR ssh (1), .BR gpg (1), diff --git a/src/monkeysphere b/src/monkeysphere index 5d865c9..6e71765 100755 --- a/src/monkeysphere +++ b/src/monkeysphere @@ -132,6 +132,11 @@ msAuthorizedKeys="$MS_HOME"/authorized_keys # make sure gpg home exists with proper permissions mkdir -p -m 0700 "$GNUPGHOME" +# make sure the user monkeysphere home directory exists +mkdir -p -m 0700 "$MS_HOME" +mkdir -p "$hostKeysCacheDir" +mkdir -p "$userKeysCacheDir" + case $COMMAND in 'update-known_hosts'|'update-known-hosts'|'k') MODE='known_hosts' |