response

1 files changed, 17 insertions, 0 deletions

diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn
index ed6cf506e..65b6befd1 100644
--- a/doc/plugins/contrib/cvs/discussion.mdwn
+++ b/doc/plugins/contrib/cvs/discussion.mdwn
@@ -24,6 +24,13 @@ the "cvs add <directory>" call and avoid doing anything in that case?
 >> It seems like it might be. You can use a `getopt` hook to check
 >> `@ARGV` to see how it was called. --[[Joey]] 
 
+>>> This does the trick iff the post-commit wrapper passes its args
+>>> along. Committed on my branch. This seems potentially dangerous,
+>>> since the args passed to ikiwiki are influenced by web commits.
+>>> I don't see an exploit, but for paranoia's sake, maybe the wrapper
+>>> should only be built with execv() if the cvs plugin is loaded?
+>>> --[[schmonz]]
+
 > Thing 2 I'm less sure of. (I'd like to see the web UI return
 > immediately on save anyway, to a temporary "rebuilding, please wait
 > if you feel like knowing when it's done" page, but this problem
@@ -42,6 +49,9 @@ the "cvs add <directory>" call and avoid doing anything in that case?
 >> on a " &" to the ikiwiki wrapper call doesn't need a wrapper script,
 >> does it? --[[Joey]]
 
+>>> Nope, it works fine to append it to the `CVSROOT/loginfo` line.
+>>> Fixed on my branch. --[[schmonz]]
+
 > Thing 3 I think I did in order to squelch the error messages that
 > were bollixing up the CGI. It was easy to do this in the wrapper
 > wrapper, but if that's going away, it can be done just as easily
@@ -51,3 +61,10 @@ the "cvs add <directory>" call and avoid doing anything in that case?
 
 >> If the error messages screw up the CGI they must go to stdout.
 >> I thought we had stderr even in the the CVS dark ages. ;-) --[[Joey]] 
+
+>>> Some messages go to stderr, but definitely not all. That's why
+>>> I wound up reaching for IPC::Cmd, to execute the command line
+>>> safely while shutting CVS up. Anyway, I've tested what happens
+>>> if a configured post-commit hook is missing, and it seems fine,
+>>> probably also thanks to IPC::Cmd.
+>>> --[[schmonz]]