Menu
▾
▴
sandweb-commit — CVS activity
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(28) |
Nov
(58) |
Dec
(85) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(125) |
Feb
(222) |
Mar
(274) |
Apr
(51) |
May
(22) |
Jun
(50) |
Jul
(15) |
Aug
(33) |
Sep
(11) |
Oct
(29) |
Nov
(17) |
Dec
(1) |
| 2003 |
Jan
(100) |
Feb
(21) |
Mar
(7) |
Apr
(45) |
May
|
Jun
(43) |
Jul
(27) |
Aug
(24) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
(1) |
Feb
|
Mar
(13) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(7) |
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: Rob H. <for...@us...> - 2003-07-22 04:04:53
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository In directory sc8-pr-cvs1:/tmp/cvs-serv9149/lib/SandWeb/Repository Modified Files: cvs.pm Log Message: put single quotes around directory that we "cd" to, so we can have spaces in directory names. Index: cvs.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v retrieving revision 1.51 retrieving revision 1.52 diff -U2 -r1.51 -r1.52 --- cvs.pm 6 Jul 2003 20:36:28 -0000 1.51 +++ cvs.pm 22 Jul 2003 04:04:50 -0000 1.52 @@ -2597,5 +2597,5 @@ my %return = $shell->execute( - 'command' => "cd $sandbox && MESSAGE_FILE=\"$users_dir/commitmsg\" && export MESSAGE_FILE && CVSEDITOR=$bindir/sandweb-editor && export CVSEDITOR && SSH_BIN=$ssh_bin && export SSH_BIN && CVS_RSH=$bindir/sandweb-ssh && export CVS_RSH && $cvs_bin -q -d \"$root\" $param \'$file\'", + 'command' => "cd \'$sandbox\' && MESSAGE_FILE=\"$users_dir/commitmsg\" && export MESSAGE_FILE && CVSEDITOR=$bindir/sandweb-editor && export CVSEDITOR && SSH_BIN=$ssh_bin && export SSH_BIN && CVS_RSH=$bindir/sandweb-ssh && export CVS_RSH && $cvs_bin -q -d \"$root\" $param \'$file\'", ); |
|
From: Rob H. <for...@us...> - 2003-07-18 11:14:27
|
Update of /cvsroot/sandweb/sandweb/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv23563/bin
Modified Files:
sandweb.cgi
Log Message:
sandweb can now dynamically change the word "VCS" to the proper name
for whatever VCS you are using (e.g. CVS, Subversion, RCS, etc.)
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.359
retrieving revision 1.360
diff -U2 -r1.359 -r1.360
--- sandweb.cgi 9 Jul 2003 06:23:33 -0000 1.359
+++ sandweb.cgi 18 Jul 2003 11:14:25 -0000 1.360
@@ -998,4 +998,5 @@
LOCATION => $location,
IMAGE_DIR => $image_dir,
+ REPO_TYPE => $repo_type,
);
}
@@ -1450,4 +1451,5 @@
LOCATION => $location,
IMAGE_DIR => $image_dir,
+ REPO_TYPE => $repo_type,
);
}
@@ -2867,5 +2869,5 @@
if ( $vcs_command eq 'VCS Command' ) {
- my $message = "Please select a VCS command.";
+ my $message = "Please select a $repo_type command.";
my $content = $ui->get_menu(
MENU => 'vcs_output',
@@ -2879,7 +2881,7 @@
print $cgi->header( -cookie => $ck_auth );
$ui->print_popup(
- TITLE=> "SandWeb :VCS Command",
+ TITLE=> "SandWeb :$repo_type Command",
MENU_TITLE => 'SandWeb',
- SUBMENU_TITLE => "VCS Command",
+ SUBMENU_TITLE => "$repo_type Command",
FOOTER => '',
CONTENT => $content,
@@ -2941,7 +2943,7 @@
print $cgi->header( -cookie => $ck_auth );
$ui->print_popup(
- TITLE=> "SandWeb : VCS $vcs_command",
+ TITLE=> "SandWeb : $repo_type $vcs_command",
MENU_TITLE => 'SandWeb',
- SUBMENU_TITLE => "VCS $vcs_command",
+ SUBMENU_TITLE => "$repo_type $vcs_command",
FOOTER => '',
CONTENT => $content,
@@ -3001,7 +3003,7 @@
print $cgi->header( -cookie => $ck_auth );
$ui->print_popup(
- TITLE=> "SandWeb : VCS $vcs_command",
+ TITLE=> "SandWeb : $repo_type $vcs_command",
MENU_TITLE => 'SandWeb',
- SUBMENU_TITLE => "VCS $vcs_command",
+ SUBMENU_TITLE => "$repo_type $vcs_command",
PREVIOUS_URL => $main_window_url,
FOOTER => '',
@@ -3025,7 +3027,7 @@
print $cgi->header( -cookie => $ck_auth );
$ui->print_popup(
- TITLE=> "SandWeb : VCS $vcs_command",
+ TITLE=> "SandWeb : $repo_type $vcs_command",
MENU_TITLE => 'SandWeb',
- SUBMENU_TITLE => "VCS $vcs_command",
+ SUBMENU_TITLE => "$repo_type $vcs_command",
PREVIOUS_URL => $main_window_url,
FOOTER => '',
@@ -3078,7 +3080,7 @@
print $cgi->header( -cookie => $ck_auth );
$ui->print_popup(
- TITLE=> "SandWeb : VCS $vcs_command",
+ TITLE=> "SandWeb : $repo_type $vcs_command",
MENU_TITLE => 'SandWeb',
- SUBMENU_TITLE => "VCS $vcs_command",
+ SUBMENU_TITLE => "$repo_type $vcs_command",
PREVIOUS_URL => $main_window_url,
FOOTER => '',
@@ -3623,7 +3625,7 @@
print $cgi->header( -cookie => $ck_auth );
$ui->print_popup(
- TITLE=> "SandWeb : VCS tag",
+ TITLE=> "SandWeb : $repo_type tag",
MENU_TITLE => 'SandWeb',
- SUBMENU_TITLE => "VCS tag",
+ SUBMENU_TITLE => "$repo_type tag",
PREVIOUS_URL => $main_window_url,
FOOTER => '',
@@ -3856,7 +3858,7 @@
print $cgi->header( -cookie => $ck_auth );
$ui->print_popup(
- TITLE=> "SandWeb : VCS branch",
+ TITLE=> "SandWeb : $repo_type branch",
MENU_TITLE => 'SandWeb',
- SUBMENU_TITLE => "VCS branch",
+ SUBMENU_TITLE => "$repo_type branch",
PREVIOUS_URL => $main_window_url,
FOOTER => '',
|
|
From: Rob H. <for...@us...> - 2003-07-18 11:14:27
|
Update of /cvsroot/sandweb/sandweb/templates In directory sc8-pr-cvs1:/tmp/cvs-serv23563/templates Modified Files: tool_bar.html Log Message: sandweb can now dynamically change the word "VCS" to the proper name for whatever VCS you are using (e.g. CVS, Subversion, RCS, etc.) Index: tool_bar.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/tool_bar.html,v retrieving revision 1.19 retrieving revision 1.20 diff -U2 -r1.19 -r1.20 --- tool_bar.html 9 Jun 2003 18:16:15 -0000 1.19 +++ tool_bar.html 18 Jul 2003 11:14:25 -0000 1.20 @@ -20,5 +20,5 @@ | <select name="vcs_command"> - <option selected>VCS Command</option> + <option selected><TMPL_VAR NAME=REPO_TYPE> Command</option> <TMPL_LOOP NAME="VCS_CMD_LOOP"> <option><TMPL_VAR NAME="VCS_CMD"></option> |
|
From: Rob H. <for...@us...> - 2003-07-12 19:56:43
|
Update of /cvsroot/sandweb/sandweb/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv27395
Modified Files:
Tag: release-1_0-branch
vcs.html
Log Message:
copying fix from trunk:
hmm.. can't have the name be both "password" and "repo_password"
Index: vcs.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/vcs.html,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -U2 -r1.10.2.1 -r1.10.2.2
--- vcs.html 1 Jun 2003 09:27:06 -0000 1.10.2.1
+++ vcs.html 12 Jul 2003 19:56:40 -0000 1.10.2.2
@@ -10,5 +10,5 @@
Please enter VCS password :
<br>
- <input type="password" name="password" name="repo_password">
+ <input type="password" name="password">
<TMPL_LOOP NAME="FILENAME_LOOP">
<input type="hidden" name="filename" value="<TMPL_VAR NAME=FILENAME>">
|
|
From: Rob H. <for...@us...> - 2003-07-12 19:55:52
|
Update of /cvsroot/sandweb/sandweb/templates In directory sc8-pr-cvs1:/tmp/cvs-serv27240 Modified Files: vcs.html Log Message: hmm.. can't have the name be both "password" and "repo_password" Index: vcs.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/vcs.html,v retrieving revision 1.11 retrieving revision 1.12 diff -U2 -r1.11 -r1.12 --- vcs.html 1 Jun 2003 10:06:29 -0000 1.11 +++ vcs.html 12 Jul 2003 19:55:49 -0000 1.12 @@ -10,5 +10,5 @@ Please enter VCS password : <br> - <input type="password" name="password" name="repo_password"> + <input type="password" name="password"> <TMPL_LOOP NAME="FILENAME_LOOP"> <input type="hidden" name="filename" value="<TMPL_VAR NAME=FILENAME>"> |
|
From: Rob H. <for...@us...> - 2003-07-11 22:42:22
|
Update of /cvsroot/sandweb/sandweb
In directory sc8-pr-cvs1:/tmp/cvs-serv2284
Modified Files:
Tag: release-1_0-branch
ChangeLog
Log Message:
checking into branch..
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sandweb/sandweb/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -U2 -r1.8 -r1.8.2.1
--- ChangeLog 3 Apr 2003 05:03:26 -0000 1.8
+++ ChangeLog 11 Jul 2003 22:42:16 -0000 1.8.2.1
@@ -1,2 +1,133 @@
+2003-07-06 00:20 formnull
+
+ * bin/sandweb-ssh: merging fix from trunk; this gets rid of the
+ annoying msg SSH would print if the ~www/.ssh was non-writable.
+
+2003-06-25 01:02 formnull
+
+ * INSTALL, INSTALL: added known issue
+
+2003-06-25 00:40 formnull
+
[...1788 lines suppressed...]
- var/log/cvswebclient.log, var/log/info.txt, var/log/sandweb.loh,
- etc/sandweb.cfg, templates/framework.html, templates/login.html,
- templates/logo_CWC.png, templates/menu_bar.html,
- templates/template.html: Initial revision
-
-2001-05-02 15:04 njennings
-
- * bin/sandweb.cgi, lib/SandWeb.pm, lib/SandWeb/Config.pm,
- lib/SandWeb/ErrHndlr.pm, lib/SandWeb/Log.pm, lib/SandWeb/UI.pm,
- lib/SandWeb/Auth.pm, var/data/cookies, var/data/info.txt,
- var/log/cvswebclient.log, var/log/info.txt, var/log/sandweb.loh,
- etc/sandweb.cfg, templates/framework.html, templates/login.html,
- templates/logo_CWC.png, templates/menu_bar.html,
- templates/template.html: importing SandWeb code from
- cvswebclient-new (all name changes complete)
+ lib/SandWeb/Log.pm, lib/SandWeb/UI.pm, lib/SandWeb/Auth.pm,
+ var/data/info.txt, var/log/info.txt, etc/sandweb.cfg,
+ templates/framework.html, templates/login.html,
+ templates/menu_bar.html, templates/template.html: Initial revision
|
|
From: Rob H. <for...@us...> - 2003-07-11 22:20:27
|
Update of /cvsroot/sandweb/sandweb In directory sc8-pr-cvs1:/tmp/cvs-serv31549 Modified Files: ChangeLog Log Message: OOPS - we only want branch changes :D Index: ChangeLog =================================================================== RCS file: /cvsroot/sandweb/sandweb/ChangeLog,v retrieving revision 1.9 retrieving revision 1.10 diff -U2 -r1.9 -r1.10 --- ChangeLog 11 Jul 2003 22:06:53 -0000 1.9 +++ ChangeLog 11 Jul 2003 22:20:18 -0000 1.10 @@ -1,66 +1,2 @@ -2003-07-09 00:22 formnull - - * bin/sandweb-expect: if we get another (p)assword prompt, we know - something is wrong, so just abort. - -2003-07-08 23:23 formnull - - * bin/sandweb.cgi, lib/SandWeb/Auth.pm, var/data/group, - var/data/info.txt: w00t! we now have a working groups file. - - it's a little strange; we're going to have to let sandweb-admin be [...1909 lines suppressed...] - var/log/cvswebclient.log, var/log/info.txt, var/log/sandweb.loh, - etc/sandweb.cfg, templates/framework.html, templates/login.html, - templates/logo_CWC.png, templates/menu_bar.html, - templates/template.html: Initial revision - -2001-05-02 15:04 njennings - - * bin/sandweb.cgi, lib/SandWeb.pm, lib/SandWeb/Config.pm, - lib/SandWeb/ErrHndlr.pm, lib/SandWeb/Log.pm, lib/SandWeb/UI.pm, - lib/SandWeb/Auth.pm, var/data/cookies, var/data/info.txt, - var/log/cvswebclient.log, var/log/info.txt, var/log/sandweb.loh, - etc/sandweb.cfg, templates/framework.html, templates/login.html, - templates/logo_CWC.png, templates/menu_bar.html, - templates/template.html: importing SandWeb code from - cvswebclient-new (all name changes complete) + lib/SandWeb/Log.pm, lib/SandWeb/UI.pm, lib/SandWeb/Auth.pm, + var/data/info.txt, var/log/info.txt, etc/sandweb.cfg, + templates/framework.html, templates/login.html, + templates/menu_bar.html, templates/template.html: Initial revision |
|
From: Rob H. <for...@us...> - 2003-07-11 22:06:56
|
Update of /cvsroot/sandweb/sandweb In directory sc8-pr-cvs1:/tmp/cvs-serv29553 Modified Files: ChangeLog Log Message: changelog generated using cvs2cl Index: ChangeLog =================================================================== RCS file: /cvsroot/sandweb/sandweb/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -U2 -r1.8 -r1.9 --- ChangeLog 3 Apr 2003 05:03:26 -0000 1.8 +++ ChangeLog 11 Jul 2003 22:06:53 -0000 1.9 @@ -1,2 +1,342 @@ +2003-07-09 00:22 formnull + + * bin/sandweb-expect: if we get another (p)assword prompt, we know + something is wrong, so just abort. + +2003-07-08 23:23 formnull + + * bin/sandweb.cgi, lib/SandWeb/Auth.pm, var/data/group, + var/data/info.txt: w00t! we now have a working groups file. + + it's a little strange; we're going to have to let sandweb-admin be + able to add/remove users from it. right now, it works on the + premise of 3 hard-coded groups : + + all read-only simple + + If you're not part of a group, you can't see the toolbar or the VCS + pulldown. + + This is pretty rough I know :) it'll get better later. at least + it's implemented correctly now, not a hack. + +2003-07-08 22:02 formnull + + * bin/sandweb.cgi: * disable the toolbar if the user doesn't belong + to any groups ( I'll break this out later so you can specify + which buttons to enable/disable per group, but that implies + some kind of per-group config that doesn't exist, it's all + hardcoded groups names in the libs at this point ) + + * I put the "groups" in here as a global var for testing, need to + figure out where to move this to... even with Unix auth, maybe a + Sandweb-specific $data_dir/groups file is the way to go even with + seperate auth mechanisms. + +2003-07-08 16:21 formnull + + * lib/SandWeb/Repository.pm: * started implementing groups for + valid VCS commands + +2003-07-08 15:08 formnull + + * debian/sandweb.cfg: turning debug off by default.. + +2003-07-08 15:07 formnull + + * bin/sandweb.cgi, debian/sandweb.cfg, lib/SandWeb.pm, + lib/SandWeb/Auth.pm, lib/SandWeb/Auth/FlatFile.pm, + lib/SandWeb/Auth/Unix.pm, templates/batch_download.html, + templates/login.html, templates/login_md5.html: * hackishly + implemented Unix auth, identified what needs to be changed to make + it cleaner * must've forgot to checkin batch_download, here it is + +2003-07-08 13:23 formnull + + * bin/sandweb-expect, bin/sandweb.cgi, lib/SandWeb/File.pm: * + extended sandweb-expect a little to support Unix auth * commented + out hacky archive code in CGI, moved to SandWeb::File + +2003-07-06 13:36 formnull + + * lib/SandWeb/Repository/cvs.pm: this was using the wrong param; + should be "remove" not "force" + +2003-07-06 00:20 formnull + + * bin/sandweb-ssh: merging fix from trunk; this gets rid of the + annoying msg SSH would print if the ~www/.ssh was non-writable. + +2003-07-06 00:19 formnull + + * bin/sandweb-ssh: removing annoying warning msg Nick reported, + came from having an unwritable ~www/.ssh dir + +2003-06-25 01:02 formnull + + * INSTALL, INSTALL, INSTALL: added known issue + +2003-06-25 00:41 formnull + + * lib/SandWeb/Repository/cvs.pm: merging "spaces in CVSROOT + setting" fix to trunk + +2003-06-25 00:40 formnull + + * lib/SandWeb/Repository/cvs.pm: allowing spaces in the CVSROOT + setting; I noticed this testing on Cygwin/Win2k, because my default + homedir is "/home/Rob Helmer", and that space was causing "make + test" to fail. + +2003-06-25 00:28 formnull + + * Makefile.PL: merging "sandweb-admin shouldn't go unconfigured to + /usr/bin" fix to trunk + +2003-06-25 00:26 formnull + + * Makefile.PL: this change makes sandweb-admin not install to + /usr/bin/ by default (since we're doing a custom install using + tools/install_script.pl, it's probably best just not to tell + MakeMaker about sandweb-admin). + + Only problem is that MakeMaker doesn't do the manpage for us + anymore; well, it just uses pod2man, I guess we can do that + ourselves, since we're doing a custom install for everything else. + +2003-06-13 22:42 formnull + + * lib/SandWeb/Security.pm: allowing : for CVSNT users (copied fix + from trunk) + +2003-06-13 22:41 formnull + + * lib/SandWeb/Security.pm: : should be safe (required for cvsnt + support) + +2003-06-09 11:16 formnull + + * images/: batch_download.png, batch_download.xcf: images for batch + download (stole from RH's "Bluecurve" icon set) + +2003-06-09 11:16 formnull + + * bin/sandweb.cgi, templates/tool_bar.html, templates/upload.html: + * disabled "CVS status" requests, this should happen from CVS/* + metadatadir anyway (those "status" patches need some cleanup + anyway) + + * new feature - batch/upload download. + +2003-06-07 22:04 formnull + + * debian/changelog: oops, debian doesn't want a - there.. + +2003-06-07 22:03 formnull + + * README, install.cfg, debian/changelog, lib/SandWeb.pm, + lib/SandWeb/Browse.pm: * bumped version number to 1.1-ALPHA on + trunk (to avoid confusion) * uncommented a debug statement in + Browse + +2003-06-01 13:42 formnull + + * tools/install_script.pl: merging "faulty images dir" fix from + branch + +2003-06-01 13:41 formnull + + * tools/install_script.pl: correcting "faulty images directory" bug + reported on sourceforge by an anonymous user ( signed as KP ) + +2003-06-01 13:26 formnull + + * bin/sandweb.cgi: password fix from branch + +2003-06-01 13:24 formnull + + * bin/sandweb.cgi: removing old commented-old test + +2003-06-01 13:24 formnull + + * bin/sandweb.cgi: oops, we were stripping characters from password + :P we handle it safely ( doesn't hit the shell directly ) so I + stopped doing that. + +2003-06-01 03:06 formnull + + * templates/branch.html, templates/commit.html, templates/vcs.html, + lib/SandWeb/Repository/cvs.pm: merging tag/branch fixes from + release branch + +2003-06-01 03:04 formnull + + * bin/sandweb.cgi: merged tag/branch fixed from release branch + +2003-06-01 03:01 formnull + + * templates/commit.html: hmm.. not sure if this'll need the submenu + param or not, might as well pass it along. + +2003-06-01 02:57 formnull + + * lib/SandWeb/Repository/cvs.pm: oops, too many quotes around + "$rev" in "-r $rev" for update CVS command, caused the tag-sync to + fail ( took me a while to figure that one out, it kept saying 'tag + "foo" does not exist', I didn't realize it literally was saying + quote foo quote :) + +2003-06-01 02:53 formnull + + * bin/sandweb.cgi, templates/branch.html: cool, branch is working + too :) + +2003-06-01 02:27 formnull + + * bin/sandweb.cgi, templates/vcs.html: tag is working again! + finally :) I ended up passing the params as a loop through the html + ( params is a hash ), then picking up the array in the CGI and + turning it back into a hash. sweet! + +2003-06-01 00:58 formnull + + * bin/sandweb.cgi, templates/vcs_output.html: copying submenu work + (for tag bug) over from trunk + +2003-06-01 00:45 formnull + + * lib/SandWeb/File.pm, lib/SandWeb/File/Unix.pm, + lib/SandWeb/Repository/cvs.pm, t/repository.t: "make test" now + works on release branch too + +2003-06-01 00:35 formnull + + * lib/SandWeb/File.pm, lib/SandWeb/File/Unix.pm, + lib/SandWeb/Repository/cvs.pm, t/repository.t: "make test" works + now. had some problem with debug statements in the pm files i + modified, just commented out the debug for now ( will revisit later + ) + +2003-06-01 00:16 formnull + + * bin/sandweb.cgi, templates/vcs_output.html: more work on the + whole tag w/out saved passwords bug :P still not working right but + this is a step in the right direction. + + we *Really* need to make the menu stuff more generic, it's a huge + pain in the ass right now. I'll tackle this after 1.0; for now I + just want what we have to work :) (it's not that bad, just tedious + to work with. too much copy/pasting to add or extend menus). + +2003-04-24 11:42 njennings + + * lib/SandWeb/Shell.pm: Merged system timeout bug and some + formatting changes from HEAD. + +2003-04-24 11:40 njennings + + * lib/SandWeb/Config.pm: Merged syntax fixes from HEAD (For Perl + 5.8). + +2003-04-24 11:38 njennings + + * tools/install_script.pl: Merged change from HEAD. + +2003-04-24 11:28 njennings + + * Makefile.PL: Added perl CGI.pm dependancy merged from HEAD. + +2003-04-24 11:20 njennings + + * lib/SandWeb/Repository/cvs.pm: Minor syntax fix. Merged from + HEAD. + +2003-04-23 18:39 njennings + + * images/: create_folder.png, create_folder.xcf, delete.png, + delete.xcf, go.png, go.xcf, no.png, no.xcf, rename.png, rename.xcf, + upload.png, upload.xcf, yes.png, yes.xcf: new images + +2003-04-23 15:57 njennings + + * lib/SandWeb/Browse.pm: lots of code formatting (tabs) fixed some + checking of undefined vars to cut down on warnings. + +2003-04-23 15:53 njennings + + * lib/SandWeb/Shell.pm: many formatting fixes (tabs) Also, fixed + Barts problem, seems system_timeout wasn't being set properly, and + ontop of that, the default (if value is null) was set to a string + '', so this caused problems. Fixed assignment, and set default to + 300 just in case this happens again. + +2003-04-23 15:48 njennings + + * lib/SandWeb/Config.pm: Apparently Perl 5.8 doesn't like overly + complex hash ref assignments. At any rate, the new assignment gives + the same results, less characters. :) + +2003-04-23 15:46 njennings + + * tools/install_script.pl: trivial text formatting correction. + +2003-04-23 15:45 njennings + + * bin/sandweb.cgi: This line was using an undefined (invalid) var. + fixed. + +2003-04-23 13:52 njennings + + * Makefile.PL: Added previously unchecked dependancy CGI (not sure + what minimum required version is so I put 0). This was previously + not checked, since it's such a standard module, but I caught it on + my current system which didn't have any perl modules installed + except for the ones which come with perl. + +2003-04-23 13:36 njennings + + * lib/SandWeb/Repository/cvs.pm: Fixed code formatting (tabs) and a + minor syntax error. + +2003-04-22 11:02 formnull + + * bin/sandweb.cgi: merged ongoing tag/branch fixage going on in the + 1.0 branch + +2003-04-22 10:55 formnull + + * bin/sandweb.cgi: better debug output ( from Claus' patch ) + +2003-04-22 10:40 formnull + + * bin/sandweb.cgi, images/create_folder.png, + images/create_folder.xcf, images/delete.png, images/delete.xcf, + images/rename.png, images/rename.xcf, images/upload.png, + images/upload.xcf, lib/SandWeb/Browse.pm, + templates/browse_module.html: committing my new images, and merging + the patch from Claus Henrikson <lin...@ya...> that adds + ViewCVS integration. + +2003-04-22 10:12 formnull + + * README, debian/changelog, lib/SandWeb.pm, templates/tag.html, + templates/vcs.html: bumping vers. no. up to RC3, and some template + changes for the tag/ branch fixes. + +2003-04-22 10:11 formnull + + * bin/sandweb.cgi: working on fixing that tag/branch bug, this is a + work in progress.. + +2003-04-06 13:00 formnull + + * templates/vcs.html: turned "border" on one of the tables from 1 + to 0, so that wierd little dot on the "Please enter VCS password" + screen that has been bugging me won't show up anymore. + +2003-04-02 21:03 formnull + + * ChangeLog: rc2 release + 2003-04-02 21:01 formnull |
|
From: Rob H. <for...@us...> - 2003-07-09 07:22:12
|
Update of /cvsroot/sandweb/sandweb/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv12815/bin
Modified Files:
sandweb-expect
Log Message:
if we get another (p)assword prompt, we know something is wrong, so just abort.
Index: sandweb-expect
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb-expect,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- sandweb-expect 8 Jul 2003 20:23:02 -0000 1.14
+++ sandweb-expect 9 Jul 2003 07:22:07 -0000 1.15
@@ -26,4 +26,5 @@
"denied" { exit 2 }
"failure" { exit 2 }
+ "assword" { exit 2 }
eof { exit 0 }
}
|
|
From: Rob H. <for...@us...> - 2003-07-09 06:23:36
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory sc8-pr-cvs1:/tmp/cvs-serv4635/lib/SandWeb
Modified Files:
Auth.pm
Log Message:
w00t! we now have a working groups file.
it's a little strange; we're going to have to let sandweb-admin be able to add/remove
users from it. right now, it works on the premise of 3 hard-coded groups :
all
read-only
simple
If you're not part of a group, you can't see the toolbar or the VCS pulldown.
This is pretty rough I know :) it'll get better later. at least it's implemented correctly
now, not a hack.
Index: Auth.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Auth.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -U2 -r1.25 -r1.26
--- Auth.pm 8 Jul 2003 22:07:51 -0000 1.25
+++ Auth.pm 9 Jul 2003 06:23:33 -0000 1.26
@@ -364,4 +364,76 @@
}
+=head1
+
+METHOD
+ get_group
+
+SYNOPSIS
+
+ my $group = $auth->get_group();
+
+DESCRIPTION
+
+ Returns highest level group that user is associated with.
+
+PARAMETERS
+
+ None.
+
+RETURN CODES
+
+
+ Returns the highest level group user is associated with.
+
+ 0 = This means that the method got an error proccessing your request.
+
+=cut
+
+sub get_group {
+ my $self = shift;
+
+ my $log = $self->_logobj();
+ my $data_dir = $self->_get_data_dir();
+ my $username = $self->get_username();
+
+ my $file = "$data_dir/group";
+ $log->debug("group file: $file");
+
+ open(GF, "<$file");
+ my @lines = <GF>;
+ close GF;
+
+ my @groups = ();
+
+ foreach my $line (@lines){
+ my ($group_name, $gid, $group_user) = split(':', $line);
+ $log->debug("inside group loop: $group_name,$gid,$group_user");
+ chomp $group_user;
+ chomp $username;
+ if ($group_user eq $username){
+ $log->debug("$group_user equals $username");
+ push @groups,$group_name;
+ } else {
+ $log->debug("$group_user is not equal to $username");
+ }
+ }
+
+ my $group = '';
+
+ # return highest level group, nothing if no group found
+ # FIXME these are all hard-coded group names/precedence for now
+
+ if ("@groups" =~ "all"){
+ $group = 'all';
+ } elsif ("@groups" =~ "simple"){
+ $group = 'simple';
+ } elsif ("@groups" =~ "read-only"){
+ $group = 'read-only';
+ }
+
+ $log->debug("returning group: $group");
+ return $group;
+}
+
sub _store_cookie_info {
my $self = shift;
|
|
From: Rob H. <for...@us...> - 2003-07-09 06:23:36
|
Update of /cvsroot/sandweb/sandweb/bin In directory sc8-pr-cvs1:/tmp/cvs-serv4635/bin Modified Files: sandweb.cgi Log Message: w00t! we now have a working groups file. it's a little strange; we're going to have to let sandweb-admin be able to add/remove users from it. right now, it works on the premise of 3 hard-coded groups : all read-only simple If you're not part of a group, you can't see the toolbar or the VCS pulldown. This is pretty rough I know :) it'll get better later. at least it's implemented correctly now, not a hack. Index: sandweb.cgi =================================================================== RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v retrieving revision 1.358 retrieving revision 1.359 diff -U2 -r1.358 -r1.359 --- sandweb.cgi 9 Jul 2003 05:02:55 -0000 1.358 +++ sandweb.cgi 9 Jul 2003 06:23:33 -0000 1.359 @@ -78,7 +78,4 @@ my $viewcvs='http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/sandweb/'; -# group FIXME needs to be implemented per-user -my $group = 'all'; - # internal global vars my $message = ''; @@ -934,4 +931,5 @@ ); + my $group = $auth->get_group(); my @vcs_commands = $repository->get_vcs_commands(group => $group); @@ -974,4 +972,5 @@ # must be in a group to get the toolbar + my $group = $auth->get_group(); if ($group){ @@ -1410,4 +1409,5 @@ ); + my $group = $auth->get_group(); my @vcs_commands = $repository->get_vcs_commands(group => $group); @@ -1431,4 +1431,5 @@ my $count = 0; # must be in a group to get the toolbar + my $group = $auth->get_group(); if ($group){ my %toolbar = $browse->get_tool_bar( |
|
From: Rob H. <for...@us...> - 2003-07-09 06:23:36
|
Update of /cvsroot/sandweb/sandweb/var/data In directory sc8-pr-cvs1:/tmp/cvs-serv4635/var/data Modified Files: info.txt Added Files: group Log Message: w00t! we now have a working groups file. it's a little strange; we're going to have to let sandweb-admin be able to add/remove users from it. right now, it works on the premise of 3 hard-coded groups : all read-only simple If you're not part of a group, you can't see the toolbar or the VCS pulldown. This is pretty rough I know :) it'll get better later. at least it's implemented correctly now, not a hack. --- NEW FILE --- all:0: read-only:1: simple:2: Index: info.txt =================================================================== RCS file: /cvsroot/sandweb/sandweb/var/data/info.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -U2 -r1.3 -r1.4 --- info.txt 20 Jul 2001 23:44:16 -0000 1.3 +++ info.txt 9 Jul 2003 06:23:33 -0000 1.4 @@ -3,5 +3,6 @@ cookies = user:cookie_string -passwd = user:<password> +passwd = user:uid:password +group = group:gid:user1,user2,user3, ... (this file must exist for directory to be checked out) |
|
From: Rob H. <for...@us...> - 2003-07-09 05:02:58
|
Update of /cvsroot/sandweb/sandweb/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv27632/bin
Modified Files:
sandweb.cgi
Log Message:
* disable the toolbar if the user doesn't belong to any groups
( I'll break this out later so you can specify which buttons to enable/disable per group,
but that implies some kind of per-group config that doesn't exist, it's all hardcoded
groups names in the libs at this point )
* I put the "groups" in here as a global var for testing, need to figure out where to
move this to... even with Unix auth, maybe a Sandweb-specific $data_dir/groups file
is the way to go even with seperate auth mechanisms.
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.357
retrieving revision 1.358
diff -U2 -r1.357 -r1.358
--- sandweb.cgi 8 Jul 2003 22:07:50 -0000 1.357
+++ sandweb.cgi 9 Jul 2003 05:02:55 -0000 1.358
@@ -74,7 +74,11 @@
my $config_dir = '../etc';
+# FIXME needs to be in the config file
# for viewcvs support in browser
my $viewcvs='http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/sandweb/';
+# group FIXME needs to be implemented per-user
+my $group = 'all';
+
# internal global vars
my $message = '';
@@ -930,5 +934,6 @@
);
- my @vcs_commands = $repository->get_vcs_commands();
+ my @vcs_commands = $repository->get_vcs_commands(group => $group);
+
$log->debug("creating Browse object");
my $browse = SandWeb::Browse->new(
@@ -964,30 +969,36 @@
#
- my %toolbar = $browse->get_tool_bar(
- 'location' => $location,
- 'progname' => $progname,
- );
-
- #
- # figure out what VCS commands we have available and build a VCS toolbar
- #
-
+ my $toolbar_menu = '';
my @loop_data = ();
my $count = 0;
- while ( $toolbar{'VCS_CMD_LOOP'}->[$count] ) {
- push (@loop_data, $toolbar{'VCS_CMD_LOOP'}->[$count]);
- $count++;
- }
-
- my $image_dir = $config->{'webserver'}->{'image_dir'};
+
+ # must be in a group to get the toolbar
+ if ($group){
+
+ my %toolbar = $browse->get_tool_bar(
+ 'location' => $location,
+ 'progname' => $progname,
+ );
- my $toolbar_menu = $ui->get_menu(
- MENU => 'tool_bar',
- VCS_CMD_LOOP => \@loop_data,
- MODULE_NAME => $module_name,
- REPO_NAME => $repo_name,
- LOCATION => $location,
- IMAGE_DIR => $image_dir,
- );
+ #
+ # figure out what VCS commands we have available and build a VCS toolbar
+ #
+
+ while ( $toolbar{'VCS_CMD_LOOP'}->[$count] ) {
+ push (@loop_data, $toolbar{'VCS_CMD_LOOP'}->[$count]);
+ $count++;
+ }
+
+ my $image_dir = $config->{'webserver'}->{'image_dir'};
+
+ $toolbar_menu = $ui->get_menu(
+ MENU => 'tool_bar',
+ VCS_CMD_LOOP => \@loop_data,
+ MODULE_NAME => $module_name,
+ REPO_NAME => $repo_name,
+ LOCATION => $location,
+ IMAGE_DIR => $image_dir,
+ );
+ }
my %current_location = $browse->get_current_location(
@@ -1351,4 +1362,5 @@
my $filename = $args{'filename'};
my $repo_root = $args{'repo_root'};
+ my $image_dir = $args{'image_dir'};
$log->debug("viewing file : $filename");
@@ -1398,5 +1410,5 @@
);
- my @vcs_commands = $repository->get_vcs_commands();
+ my @vcs_commands = $repository->get_vcs_commands(group => $group);
$log->debug("creating Browse object");
@@ -1414,14 +1426,28 @@
my $repo_type = $repository->get_repo_type();
- my %toolbar = $browse->get_tool_bar(
- 'location' => $location,
- 'progname' => $progname,
- );
+ my $toolbar_menu = '';
my @loop_data = ();
my $count = 0;
- while ( $toolbar{'VCS_CMD_LOOP'}->[$count] ) {
- push (@loop_data, $toolbar{'VCS_CMD_LOOP'}->[$count]);
- $count++;
+ # must be in a group to get the toolbar
+ if ($group){
+ my %toolbar = $browse->get_tool_bar(
+ 'location' => $location,
+ 'progname' => $progname,
+ );
+
+ while ( $toolbar{'VCS_CMD_LOOP'}->[$count] ) {
+ push (@loop_data, $toolbar{'VCS_CMD_LOOP'}->[$count]);
+ $count++;
+ }
+
+ $toolbar_menu = $ui->get_menu(
+ MENU => 'tool_bar',
+ VCS_CMD_LOOP => \@loop_data,
+ MODULE_NAME => $module_name,
+ REPO_NAME => $repo_name,
+ LOCATION => $location,
+ IMAGE_DIR => $image_dir,
+ );
}
@@ -1430,13 +1456,4 @@
# javascript for pop-ups
my $js = $ui->get_javascript( SCRIPT => "openwindow" );
-
- my $toolbar_menu = $ui->get_menu(
- MENU => 'tool_bar',
- VCS_CMD_LOOP => \@loop_data,
- MODULE_NAME => $module_name,
- REPO_NAME => $repo_name,
- LOCATION => $location,
- IMAGE_DIR => $image_dir,
- );
my %current_location = $browse->get_current_location(
|
|
From: Rob H. <for...@us...> - 2003-07-08 23:21:26
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory sc8-pr-cvs1:/tmp/cvs-serv9806/lib/SandWeb
Modified Files:
Repository.pm
Log Message:
* started implementing groups for valid VCS commands
Index: Repository.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository.pm,v
retrieving revision 1.52
retrieving revision 1.53
diff -U2 -r1.52 -r1.53
--- Repository.pm 1 Apr 2003 02:46:26 -0000 1.52
+++ Repository.pm 8 Jul 2003 23:21:23 -0000 1.53
@@ -2492,4 +2492,16 @@
}
+# FIXME needs documentation
+
+sub get_vcs {
+ my $self = shift;
+ if ($self->{'vcs'}) {
+ return \$self->{'vcs'};
+ }
+ else {
+ return 0;
+ }
+}
+
=head1
@@ -2526,31 +2538,47 @@
=cut
-sub get_vcs {
+sub get_vcs_commands {
my $self = shift;
- if ($self->{'vcs'}) {
- return \$self->{'vcs'};
- }
- else {
+ my %args = @_;
+
+ my $group = $args{'group'} || '';
+
+ if ($group eq 'read-only'){
+ return (
+ 'annotate',
+ 'diff',
+ 'editors',
+ 'history',
+ 'log',
+ 'status',
+ 'update',
+ );
+
+ } elsif ($group eq 'simple'){
+ return(
+ 'add',
+ 'commit',
+ 'update',
+ );
+ } elsif ($group eq 'all'){
+ return (
+ 'add',
+ 'annotate',
+ 'branch',
+ 'commit',
+ 'diff',
+ 'edit',
+ 'editors',
+ 'history',
+ 'log',
+ 'remove',
+ 'status',
+ 'tag',
+ 'unedit',
+ 'update',
+ );
+ } else {
return 0;
}
-}
-
-sub get_vcs_commands {
- return (
- 'add',
- 'annotate',
- 'branch',
- 'commit',
- 'diff',
- 'edit',
- 'editors',
- 'history',
- 'log',
- 'remove',
- 'status',
- 'tag',
- 'unedit',
- 'update',
- );
}
|
|
From: Rob H. <for...@us...> - 2003-07-08 22:08:34
|
Update of /cvsroot/sandweb/sandweb/debian In directory sc8-pr-cvs1:/tmp/cvs-serv30301/debian Modified Files: sandweb.cfg Log Message: turning debug off by default.. Index: sandweb.cfg =================================================================== RCS file: /cvsroot/sandweb/sandweb/debian/sandweb.cfg,v retrieving revision 1.3 retrieving revision 1.4 diff -U2 -r1.3 -r1.4 --- sandweb.cfg 8 Jul 2003 22:07:51 -0000 1.3 +++ sandweb.cfg 8 Jul 2003 22:08:32 -0000 1.4 @@ -3,5 +3,5 @@ <!-- config tree for logging behavior --> - <logging debug="1" + <logging debug="0" log="1" /> |
|
From: Rob H. <for...@us...> - 2003-07-08 22:07:54
|
Update of /cvsroot/sandweb/sandweb/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv30111/templates
Modified Files:
login.html
Added Files:
batch_download.html login_md5.html
Log Message:
* hackishly implemented Unix auth, identified what needs to be changed to make it cleaner
* must've forgot to checkin batch_download, here it is
--- NEW FILE ---
<table width="100%" border="0" align="center" cellspacing="0" cellpadding="0">
<tr>
<td width="center">
<form name="commit" type="POST">
<!-- <TMPL_VAR NAME=PROGNAME> -->
<input type="hidden" name="action" value="vcs">
<input type="hidden" name="vcs_command" value="commit">
<input type="hidden" name="filename" value="<TMPL_VAR NAME=FILENAME>">
<input type="hidden" name="location" value="<TMPL_VAR NAME=LOCATION>">
<input type="hidden" name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>">
<input type="hidden" name="repo_name" value="<TMPL_VAR NAME=REPO_NAME>">
<input type="hidden" name="repo_password" value="<TMPL_VAR NAME=REPO_PASSWORD>">
<input type="hidden" name="submenu" value="<TMPL_VAR NAME=SUBMENU>">
<a href="<TMPL_VAR NAME=DOWNLOAD>">Download</a>
</form>
</td>
</tr>
</table>
--- NEW FILE ---
<script language="JavaScript" type="text/javascript">
function updateHash (hashed, password, salt) {
hashed.value = calcMD5(password.value)
hashed.value = calcMD5(hashed.value + salt.value);
}
</script>
<form method="post" action="<TMPL_VAR NAME=PROGNAME>" enctype="application/x-www-form-urlencoded" name="login">
<input type="hidden" name="action" value="login">
<table width="100%" border="0" align="center" cellspacing="0" cellpadding="0">
<tr>
<td width="30%" align="right">
Username :
</td>
<td width="70%" align="left">
<input type="text" name="username" size="10">
</td>
</tr>
<tr>
<td width="20%" align="right">
Password :
</td>
<!-- user type password here -->
<td width="80%" align="left">
<input type="password" name="password1" size="10"
onKeyUp="updateHash(password, password1, salt)"
>
</td>
<!-- the password (MD5'ed) is here -->
<td width="80%" align="left">
<input type="hidden" name="password" size="80">
</td>
<!-- the the salt (or challenge) is here -->
<td width="80%" align="left">
<input type="hidden" name=salt size="80">
<script language="javascript" type="text/javascript">
document.login.salt.value='<TMPL_VAR NAME=SALT>';
</script>
</td>
</tr>
<tr>
<td width="20%" align="right">
<br>
<input type="submit" name="Submit" value="Login"
onClick="updateHash(password, password1, salt)
password1.value='' "
>
</td>
<td width="80%" align="left">
<br>
<input type="reset" value="Clear">
</td>
</tr>
</table>
</form>
Index: login.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/login.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- login.html 13 Jan 2003 01:09:46 -0000 1.15
+++ login.html 8 Jul 2003 22:07:52 -0000 1.16
@@ -1,9 +1,2 @@
-<script language="JavaScript" type="text/javascript">
-function updateHash (hashed, password, salt) {
- hashed.value = calcMD5(password.value)
- hashed.value = calcMD5(hashed.value + salt.value);
-}
-</script>
-
<form method="post" action="<TMPL_VAR NAME=PROGNAME>" enctype="application/x-www-form-urlencoded" name="login">
<input type="hidden" name="action" value="login">
@@ -24,31 +17,11 @@
<!-- user type password here -->
<td width="80%" align="left">
- <input type="password" name="password1" size="10"
- onKeyUp="updateHash(password, password1, salt)"
- >
+ <input type="password" name="password" size="10">
</td>
-
-<!-- the password (MD5'ed) is here -->
- <td width="80%" align="left">
- <input type="hidden" name="password" size="80">
- </td>
-
-<!-- the the salt (or challenge) is here -->
- <td width="80%" align="left">
- <input type="hidden" name=salt size="80">
- <script language="javascript" type="text/javascript">
- document.login.salt.value='<TMPL_VAR NAME=SALT>';
- </script>
-
- </td>
-
</tr>
<tr>
<td width="20%" align="right">
<br>
- <input type="submit" name="Submit" value="Login"
- onClick="updateHash(password, password1, salt)
- password1.value='' "
- >
+ <input type="submit" name="Submit" value="Login">
</td>
<td width="80%" align="left">
|
|
From: Rob H. <for...@us...> - 2003-07-08 22:07:54
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory sc8-pr-cvs1:/tmp/cvs-serv30111/lib/SandWeb
Modified Files:
Auth.pm
Log Message:
* hackishly implemented Unix auth, identified what needs to be changed to make it cleaner
* must've forgot to checkin batch_download, here it is
Index: Auth.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Auth.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -U2 -r1.24 -r1.25
--- Auth.pm 6 Jan 2003 09:41:09 -0000 1.24
+++ Auth.pm 8 Jul 2003 22:07:51 -0000 1.25
@@ -35,4 +35,5 @@
use SandWeb::Auth::FlatFile;
+use SandWeb::Auth::Unix;
=head1
@@ -48,4 +49,5 @@
'log_obj' => $log,
'data_dir' => $config->{'paths'}->{'data_dir'},
+ 'users_dir' => $config->{'paths'}->{'users_dir'},
'cookie_path' => $config->{'cookie'}->{'path'},
'cookie_domain' => $config->{'cookie'}->{'domain'},
@@ -105,4 +107,5 @@
'_log_obj' => $args{'log_obj'},
'_data_dir' => $args{'data_dir'},
+ '_users_dir' => $args{'users_dir'},
'_cookie_path' => $args{'cookie_path'},
'_cookie_domain' => $args{'cookie_domain'},
@@ -167,14 +170,21 @@
my $username = $args{'username'};
my $password = $args{'password'};
- my $salt = $args{'salt'};
+ #my $salt = $args{'salt'};
my $log = $self->_logobj();
$log->debug("username: $username, password: $password\n");
- my $flatfile = SandWeb::Auth::FlatFile::->new(
+ #my $auth = SandWeb::Auth::FlatFile::->new(
+ # 'log_obj' => $log,
+ #);
+ my $auth = SandWeb::Auth::Unix::->new(
'log_obj' => $log,
);
- my $verified = $flatfile->verify_password($username, $password, $self->_get_data_dir(), $salt);
+ my $verified = $auth->verify_password(
+ $username,
+ $password,
+ $self->_get_users_dir(),
+ );
if ($verified) {
@@ -457,4 +467,8 @@
my $self = shift;
return $self->{'_data_dir'};
+}
+sub _get_users_dir {
+ my $self = shift;
+ return $self->{'_users_dir'};
}
sub _logobj {
|
|
From: Rob H. <for...@us...> - 2003-07-08 22:07:54
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Auth
In directory sc8-pr-cvs1:/tmp/cvs-serv30111/lib/SandWeb/Auth
Modified Files:
FlatFile.pm
Added Files:
Unix.pm
Log Message:
* hackishly implemented Unix auth, identified what needs to be changed to make it cleaner
* must've forgot to checkin batch_download, here it is
--- NEW FILE ---
=pod
=head1
SandWeb::Auth::Unix
This class verifies passwords for a given username using the Unix "su" command, and returns
true if the user if authentic, false if not.
=cut
# SandWeb (Web-based VCS client)
#
# Copyright (C) 2002 Nick Jennings
# Copyright (C) 2002 Robert Helmer
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
=head1
part of the SandWeb::Auth::Unix package
=cut
package SandWeb::Auth::Unix;
=head1
=head1
uses SandWeb::Shell to call "su"
=cut
use SandWeb::Shell;
=head1
Methods
=cut
=head1
METHOD
new
SYNOPSIS
my $unix = SandWeb::Auth::Unix::->new(
'log_obj' => $log,
);
DESCRIPTION
This method is a constructor.
PARAMETERS
log_obj (type: string) (required)
A reference to an instantiated log object.
Default: none.
RETURN CODES
Returns a reference to a an Auth::Unix object.
0 = This means that the method got an error proccessing your request.
Perhaps an invalid parameter?
=cut
sub new {
my $class = shift;
my %args = @_;
my $self = bless {
'user_info' => {},
'_log_obj' => $args{'log_obj'},
}, $class;
return $self;
}
=head1
METHOD
verify_password
SYNOPSIS
my $user_is_authentic = $unix->verify_password(
username => $username,
password => $password,
user_dir => $user_dir,
};
DESCRIPTION
This method verifies if a user is authentic or not by running "su" through
sandweb-expect, and seeing if we can run the "echo" command".
PARAMETERS
username (type: string) (required)
The current user's full username.
Default: none.
password (type: string) (required)
The plain-text password to verify.
Default: none.
data_dir (type: string) (required)
The root of where homedirs are stored.
Default: none.
RETURN CODES
1 = The operation completed successfully.
0 = This means that the method got an error proccessing your request.
Perhaps an invalid parameter?
=cut
sub verify_password {
my $self = shift;
my $username = shift;
my $password = shift;
my $users_dir = shift;
my $log = $self->_logobj();
$log->debug("Verifying Unix password");
$log->debug("before shell");
my %return = shell(
username => $username,
password => $password,
users_dir => $users_dir,
log => $log,
);
$log->debug("after shell");
$log->debug("output : $return{'output'}");
my $message = $return{'output'};
if ($message =~ 'success'){
# user is authentic
return 1;
}else{
# user is NOT authentic
return 0;
}
}
sub shell {
my %args = @_;
my $username = $args{'username'} || '';
my $password = $args{'password'} || '';
my $users_dir = $args{'users_dir'} || '';
my $log = $args{'log'} || '';
my $file = $args{'file'};
my $param = $args{'param'};
$log->debug("Creating Shell object");
my $shell = SandWeb::Shell->new(
'system_timeout' => "100",
'bindir' => "/usr/bin",
'vcs_username' => "$username",
'users_dir' => "$users_dir/$username",
'vcs_password' => "$password",
'vcs' => 'none',
'log_obj' => $log,
);
$log->debug('command' => "export SSH_BIN=/usr/bin/ssh && /usr/bin/sandweb-ssh $username\@localhost echo success");
my %return = $shell->execute('command' => "export SSH_BIN=/usr/bin/ssh && /usr/bin/sandweb-ssh $username\@localhost echo success");
return %return;
}
sub _logobj {
my $self = shift;
return $self->{'_log_obj'};
}
1;
Index: FlatFile.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Auth/FlatFile.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- FlatFile.pm 14 Jan 2003 07:17:01 -0000 1.11
+++ FlatFile.pm 8 Jul 2003 22:07:51 -0000 1.12
@@ -135,6 +135,4 @@
The root of where homedirs are stored.
- FIXME - why does verify_password need to know this?
-
Default: none.
|
|
From: Rob H. <for...@us...> - 2003-07-08 22:07:54
|
Update of /cvsroot/sandweb/sandweb/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv30111/lib
Modified Files:
SandWeb.pm
Log Message:
* hackishly implemented Unix auth, identified what needs to be changed to make it cleaner
* must've forgot to checkin batch_download, here it is
Index: SandWeb.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -U2 -r1.28 -r1.29
--- SandWeb.pm 8 Jun 2003 05:03:42 -0000 1.28
+++ SandWeb.pm 8 Jul 2003 22:07:51 -0000 1.29
@@ -216,4 +216,5 @@
my $auth = SandWeb::Auth::->new(
'log_obj' => $log,
+ 'users_dir' => $config->{'paths'}->{'users_dir'},
'data_dir' => $config->{'paths'}->{'data_dir'},
'cookie_path' => $config->{'cookie'}->{'path'},
|
|
From: Rob H. <for...@us...> - 2003-07-08 22:07:53
|
Update of /cvsroot/sandweb/sandweb/bin In directory sc8-pr-cvs1:/tmp/cvs-serv30111/bin Modified Files: sandweb.cgi Log Message: * hackishly implemented Unix auth, identified what needs to be changed to make it cleaner * must've forgot to checkin batch_download, here it is Index: sandweb.cgi =================================================================== RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v retrieving revision 1.356 retrieving revision 1.357 diff -U2 -r1.356 -r1.357 --- sandweb.cgi 8 Jul 2003 20:23:02 -0000 1.356 +++ sandweb.cgi 8 Jul 2003 22:07:50 -0000 1.357 @@ -709,10 +709,10 @@ MENU => 'login', PROGNAME => "$progname", - SALT => $salt, + #SALT => $salt, ); - my $javascript = $ui->get_javascript( - SCRIPT => 'md5', - ); + #my $javascript = $ui->get_javascript( + # SCRIPT => 'md5', + #); print $cgi->header; @@ -723,5 +723,5 @@ FOOTER => '', CONTENT => $content, - JAVASCRIPT => $javascript, + #JAVASCRIPT => $javascript, MESSAGE => $message, ); |
|
From: Rob H. <for...@us...> - 2003-07-08 22:07:53
|
Update of /cvsroot/sandweb/sandweb/debian In directory sc8-pr-cvs1:/tmp/cvs-serv30111/debian Modified Files: sandweb.cfg Log Message: * hackishly implemented Unix auth, identified what needs to be changed to make it cleaner * must've forgot to checkin batch_download, here it is Index: sandweb.cfg =================================================================== RCS file: /cvsroot/sandweb/sandweb/debian/sandweb.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -U2 -r1.2 -r1.3 --- sandweb.cfg 1 Apr 2003 02:46:26 -0000 1.2 +++ sandweb.cfg 8 Jul 2003 22:07:51 -0000 1.3 @@ -3,5 +3,5 @@ <!-- config tree for logging behavior --> - <logging debug="0" + <logging debug="1" log="1" /> |
|
From: Rob H. <for...@us...> - 2003-07-08 20:23:05
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory sc8-pr-cvs1:/tmp/cvs-serv13418/lib/SandWeb
Modified Files:
File.pm
Log Message:
* extended sandweb-expect a little to support Unix auth
* commented out hacky archive code in CGI, moved to SandWeb::File
Index: File.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/File.pm,v
retrieving revision 1.65
retrieving revision 1.66
diff -U2 -r1.65 -r1.66
--- File.pm 1 Jun 2003 07:35:11 -0000 1.65
+++ File.pm 8 Jul 2003 20:23:02 -0000 1.66
@@ -576,4 +576,67 @@
return $module->download( mime_type => $mime_type );
}
+=head1
+
+METHOD
+ archive
+
+SYNOPSIS
+
+ my $return_code = $file->archive(
+ files => \@files,
+ name => $name,
+ );
+
+DESCRIPTION
+
+ Creates archive containing file(s).
+
+PARAMETERS
+
+ files (type: string) (required)
+
+ A list of files to put into the archive.
+
+ Default: none.
+
+ NOTE: this is an array
+
+ name (type: string) (required)
+
+ The name of the archive.
+
+RETURN CODES
+
+ 1 = The operation completed successfully.
+
+ 0 = This means that the method got an error proccessing your request.
+ Perhaps an invalid parameter?
+
+ -1 = This return value means that there was not sufficient permision to
+ read the files specified, or they did not exist.
+
+=cut
+
+sub archive {
+ my $self = shift;
+ my %args = @_;
+
+ my $location = $self->{'location'};
+ my $filename = $self->{'filename'};
+ my $log = $self->{'log_obj'};
+
+ my @files = @$args{'files'};
+
+ my $module = SandWeb::File::Unix->new(
+ filename => $filename,
+ log_obj => $log,
+ location => $location,
+ );
+
+ return $module->archive(
+ files => \@files,
+ name => $name,
+ );
+}
=head1
|
|
From: Rob H. <for...@us...> - 2003-07-08 20:23:05
|
Update of /cvsroot/sandweb/sandweb/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv13418/bin
Modified Files:
sandweb-expect sandweb.cgi
Log Message:
* extended sandweb-expect a little to support Unix auth
* commented out hacky archive code in CGI, moved to SandWeb::File
Index: sandweb-expect
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb-expect,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- sandweb-expect 1 Apr 2003 20:14:11 -0000 1.13
+++ sandweb-expect 8 Jul 2003 20:23:02 -0000 1.14
@@ -1,3 +1,3 @@
-#!expect
+#!/usr/bin/expect
#
@@ -20,9 +20,10 @@
expect {
- "password:" { send "$vcs_password\r" }
+ "assword:" { send "$vcs_password\r" }
eof { exit 0 }
}
expect {
"denied" { exit 2 }
+ "failure" { exit 2 }
eof { exit 0 }
}
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.355
retrieving revision 1.356
diff -U2 -r1.355 -r1.356
--- sandweb.cgi 9 Jun 2003 18:16:13 -0000 1.355
+++ sandweb.cgi 8 Jul 2003 20:23:02 -0000 1.356
@@ -1996,5 +1996,12 @@
}
- # FIXME - move to SW::File
+ # FIXME - move to SW::File e.g.:
+ #
+ #$file->create_archive(
+ # name => $name,
+ # location => "$users_dir/$username/$repo_name";
+ # files => $files,
+ #);
+ #
print `cd $users_dir/$username/$repo_name/ && /bin/tar -cf $users_dir/$username/.tmp/$module_name.tar $files 2>&1 > /dev/null`;
|
|
From: Rob H. <for...@us...> - 2003-07-06 20:36:31
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory sc8-pr-cvs1:/tmp/cvs-serv27076/lib/SandWeb/Repository
Modified Files:
cvs.pm
Log Message:
this was using the wrong param; should be "remove" not "force"
Index: cvs.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v
retrieving revision 1.50
retrieving revision 1.51
diff -U2 -r1.50 -r1.51
--- cvs.pm 25 Jun 2003 07:41:47 -0000 1.50
+++ cvs.pm 6 Jul 2003 20:36:28 -0000 1.51
@@ -1798,9 +1798,8 @@
my $recurse = $params{'recurse'};
my $file = $params{'file'};
- my $force = $params{'force'};
my @param = 'remove';
- if ($force) { push @param, " -f" };
+ if ($remove) { push @param, " -f" };
if ($recurse) { push @param, " -R" };
|
|
From: Rob H. <for...@us...> - 2003-07-06 07:20:48
|
Update of /cvsroot/sandweb/sandweb/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv31776
Modified Files:
Tag: release-1_0-branch
sandweb-ssh
Log Message:
merging fix from trunk; this gets rid of the annoying msg SSH would print
if the ~www/.ssh was non-writable.
Index: sandweb-ssh
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb-ssh,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -U2 -r1.1 -r1.1.2.1
--- sandweb-ssh 1 Apr 2003 01:21:40 -0000 1.1
+++ sandweb-ssh 6 Jul 2003 07:20:44 -0000 1.1.2.1
@@ -24,5 +24,5 @@
# Here's the main action of this script
-$SSH_BIN -o'StrictHostKeyChecking no' $SSH_ARGS
+$SSH_BIN -q -o'StrictHostKeyChecking no' $SSH_ARGS
# Exit normally
|
3 messages has been excluded from this view by a project administrator.
