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: Nick J. <nje...@us...> - 2002-03-12 05:11:50
|
Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv8307
Added Files:
openwindow.js
Log Message:
* openwindow.js - javascript function for opening a popup window
--- NEW FILE ---
window.name = "mainWindow";
function myOpenWindow() {
window.open('about:blank','popUp','width=400,height=300,scrollbars=yes,resizable=yes');
}
|
|
From: Nick J. <nje...@us...> - 2002-03-12 05:11:14
|
Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv8234
Added Files:
submitform.js
Log Message:
* submitform.js - javascript functions for submitting a javascript form.
--- NEW FILE ---
function submitForm(clicked) {
document.repository.repository_selected.value=clicked;
document.repository.submit();
}
function doSubmit(clicked) {
var submitOk = false;
if (checkForm(clicked)) {
submitOk = true
}
if (submitOk) {
submitForm(clicked);
}
}
|
|
From: Nick J. <nje...@us...> - 2002-03-12 04:34:08
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv1920
Modified Files:
Config.pm
Log Message:
* modified erro return behavior
Index: Config.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Config.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -U2 -r1.26 -r1.27
--- Config.pm 10 Mar 2002 01:56:05 -0000 1.26
+++ Config.pm 12 Mar 2002 04:34:05 -0000 1.27
@@ -144,5 +144,5 @@
open(F, ">$config_dir/$config_file") or
- $log->debug("Unable to write to file '$config_dir/$config_file': $!\n");
+ return(0, "Unable to write to file '$config_dir/$config_file': $!\n");
print F XMLout(\%data, rootname => 'preferences' );
close F;
@@ -472,2 +472,4 @@
1;
+
+
|
|
From: Nick J. <nje...@us...> - 2002-03-12 04:33:46
|
Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv1824
Modified Files:
sandweb.cgi
Log Message:
* Updated error reporting behavior
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.265
retrieving revision 1.266
diff -U2 -r1.265 -r1.266
--- sandweb.cgi 12 Mar 2002 04:30:37 -0000 1.265
+++ sandweb.cgi 12 Mar 2002 04:33:44 -0000 1.266
@@ -2392,5 +2392,5 @@
$log->debug("ERROR: $msg");
$log->error("$msg");
- set_message("$msg");
+ set_message("Unable to write config file for $username.");
return 0;
}
|
|
From: Nick J. <nje...@us...> - 2002-03-12 04:30:40
|
Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv1173
Modified Files:
sandweb.cgi
Log Message:
* apparently this was not using the write_config function (and was
doing the work itself)
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.264
retrieving revision 1.265
diff -U2 -r1.264 -r1.265
--- sandweb.cgi 12 Mar 2002 03:45:53 -0000 1.264
+++ sandweb.cgi 12 Mar 2002 04:30:37 -0000 1.265
@@ -750,5 +750,4 @@
load_config(1); # load prefs and do not log error msg
my $username = $auth->get_username();
- # XXX - username();
my $full_name = $user->get_full_name();
my $work_dir = $user->get_work_dir();
@@ -2206,15 +2205,7 @@
}
- my $username = $auth->get_username();
- # write config data into the .$user_cfg file in the users directory
- my ($return, $msg) = $user->write_preferences_config(
- 'config_dir' => $config->{'paths'}->{'users_dir'} . "/$username",
- 'config_file' => ".$user_cfg",
- );
-
- if (! $return) {
- # uh oh, problem occured
- $log->error("$msg");
- set_message("$msg");
+ my $return = write_config();
+ if (! $return) {
+ # uh oh, problem occured
preferences_menu( ck_auth => $ck_auth );
}
@@ -2354,5 +2345,4 @@
'log_obj' => $log,
);
-
$user = $return->{'data'};
$user->{'repo'} = {};
|
|
From: Nick J. <nje...@us...> - 2002-03-12 04:15:22
|
Update of /cvsroot/sandweb/sandweb/etc
In directory usw-pr-cvs1:/tmp/cvs-serv31262
Added Files:
user.cfg
Removed Files:
prefs.cfg
Log Message:
* changes user config to user.cfg from prefs.cfg, this was old change
that we never made to default user.cfg
--- NEW FILE ---
<preferences>
<!-- the personal tag defines user's real name, and the
path to the sandbox on the user's workstation -->
<personal full_name=""
work_dir=""
/>
</preferences>
--- prefs.cfg DELETED ---
|
|
From: Rob H. <for...@us...> - 2002-03-12 03:48:57
|
Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv26436/templates
Modified Files:
popup.html
Log Message:
popup.html needs JAVASCRIPT TMPL_VAR as well as framework
Index: popup.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/popup.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- popup.html 2 Mar 2002 08:14:10 -0000 1.2
+++ popup.html 12 Mar 2002 03:48:54 -0000 1.3
@@ -7,4 +7,7 @@
<title><TMPL_VAR NAME=TITLE></title>
</head>
+ <script language="JavaScript">
+ <TMPL_VAR NAME=JAVASCRIPT>
+ </script>
<style>
<!--
|
|
From: Rob H. <for...@us...> - 2002-03-12 03:45:58
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv25899/lib/SandWeb
Modified Files:
UI.pm
Log Message:
ok, md5.js no longer needs to be on the docroot. kick ass!
Index: UI.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/UI.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -U2 -r1.33 -r1.34
--- UI.pm 10 Mar 2002 23:23:07 -0000 1.33
+++ UI.pm 12 Mar 2002 03:45:54 -0000 1.34
@@ -72,4 +72,5 @@
FOOTER => $footer,
CONTENT => $args{'CONTENT'},
+ JAVASCRIPT => $args{'JAVASCRIPT'},
MENU_BAR => $menu_bar,
DEBUG => \@debug_msgs,
@@ -110,4 +111,5 @@
MENU_TITLE => $args{'MENU_TITLE'},
CONTENT => $args{'CONTENT'},
+ JAVASCRIPT => $args{'JAVASCRIPT'},
PREVIOUS_URL => $args{'PREVIOUS_URL'},
DEBUG => \@debug_msgs,
@@ -152,4 +154,21 @@
# generate content data
my $tmp = HTML::Template->new(filename => "$template_dir/$menu.html");
+ $tmp->param( %args );
+ my @contents = $tmp->output;
+ return join('', @contents);
+}
+
+sub get_javascript {
+ my $self = shift;
+ my %args = @_;
+
+ my $template_dir = $self->_get_template_dir();
+ my $log = $self->_logobj();
+
+ my $script = $args{'SCRIPT'};
+ delete $args{'SCRIPT'};
+
+ # generate content data
+ my $tmp = HTML::Template->new(filename => "$template_dir/$script.js");
$tmp->param( %args );
my @contents = $tmp->output;
|
|
From: Rob H. <for...@us...> - 2002-03-12 03:45:58
|
Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv25899/templates
Modified Files:
framework.html login.html
Log Message:
ok, md5.js no longer needs to be on the docroot. kick ass!
Index: framework.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/framework.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -U2 -r1.18 -r1.19
--- framework.html 4 Mar 2002 09:15:40 -0000 1.18
+++ framework.html 12 Mar 2002 03:45:54 -0000 1.19
@@ -7,4 +7,7 @@
<title><TMPL_VAR NAME=TITLE></title>
</head>
+ <script language="JavaScript">
+ <TMPL_VAR NAME=JAVASCRIPT>
+ </script>
<style>
<!--
Index: login.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/login.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- login.html 11 Mar 2002 19:43:41 -0000 1.7
+++ login.html 12 Mar 2002 03:45:54 -0000 1.8
@@ -1,3 +1,2 @@
-<script language="JavaScript" src="/md5.js"></script>
<script language="JavaScript">
function updateHash (hashed, password, salt) {
|
|
From: Rob H. <for...@us...> - 2002-03-12 03:45:58
|
Update of /cvsroot/sandweb/sandweb/bin In directory usw-pr-cvs1:/tmp/cvs-serv25899/bin Modified Files: sandweb.cgi Log Message: ok, md5.js no longer needs to be on the docroot. kick ass! Index: sandweb.cgi =================================================================== RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v retrieving revision 1.263 retrieving revision 1.264 diff -U2 -r1.263 -r1.264 --- sandweb.cgi 11 Mar 2002 19:43:40 -0000 1.263 +++ sandweb.cgi 12 Mar 2002 03:45:53 -0000 1.264 @@ -435,4 +435,8 @@ ); + my $javascript = $ui->get_javascript( + SCRIPT => 'md5', + ); + print CGI::header; $ui->print_screen( @@ -442,4 +446,5 @@ FOOTER => '', CONTENT => $content, + JAVASCRIPT => $javascript, MESSAGE => $message, ); |
|
From: Rob H. <for...@us...> - 2002-03-12 03:40:12
|
Update of /cvsroot/sandweb/sandweb/templates In directory usw-pr-cvs1:/tmp/cvs-serv24970 Added Files: md5.js Log Message: moving md5.js from templates/js into templates/ --- NEW FILE --- /* * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message * Digest Algorithm, as defined in RFC 1321. * Copyright (C) Paul Johnston 1999 - 2002. * Code also contributed by Greg Holt * See http://pajhome.org.uk/site/legal.html for details. */ /* * Convert a 32-bit number to a hex string with ls-byte first */ var hex_chr = "0123456789abcdef"; function rhex(num) { var str = ""; for(var j = 0; j <= 3; j++) str += hex_chr.charAt((num >> (j * 8 + 4)) & 0x0F) + hex_chr.charAt((num >> (j * 8)) & 0x0F); return str; } /* * Convert a string to a sequence of 16-word blocks, stored as an array. * Append padding bits and the length, as described in the MD5 standard. */ function str2blks_MD5(str) { var nblk = ((str.length + 8) >> 6) + 1; // number of 16-word blocks var blks = new Array(nblk * 16); for(var i = 0; i < nblk * 16; i++) blks[i] = 0; for(var i = 0; i < str.length; i++) blks[i >> 2] |= str.charCodeAt(i) << ((i % 4) * 8); blks[i >> 2] |= 0x80 << ((i % 4) * 8); blks[nblk * 16 - 2] = str.length * 8; return blks; } /* * Add integers, wrapping at 2^32. This uses 16-bit operations internally * to work around bugs in some JS interpreters. */ function safe_add(x, y) { var lsw = (x & 0xFFFF) + (y & 0xFFFF); var msw = (x >> 16) + (y >> 16) + (lsw >> 16); return (msw << 16) | (lsw & 0xFFFF); } /* * Bitwise rotate a 32-bit number to the left */ function rol(num, cnt) { return (num << cnt) | (num >>> (32 - cnt)); } /* * These functions implement the basic operation for each round of the * algorithm. */ function cmn(q, a, b, x, s, t) { return safe_add(rol(safe_add(safe_add(a, q), safe_add(x, t)), s), b); } function ff(a, b, c, d, x, s, t) { return cmn((b & c) | ((~b) & d), a, b, x, s, t); } function gg(a, b, c, d, x, s, t) { return cmn((b & d) | (c & (~d)), a, b, x, s, t); } function hh(a, b, c, d, x, s, t) { return cmn(b ^ c ^ d, a, b, x, s, t); } function ii(a, b, c, d, x, s, t) { return cmn(c ^ (b | (~d)), a, b, x, s, t); } /* * Take a string and return the hex representation of its MD5. */ function calcMD5(str) { var x = str2blks_MD5(str); var a = 1732584193; var b = -271733879; var c = -1732584194; var d = 271733878; for(i = 0; i < x.length; i += 16) { var olda = a; var oldb = b; var oldc = c; var oldd = d; a = ff(a, b, c, d, x[i+ 0], 7 , -680876936); d = ff(d, a, b, c, x[i+ 1], 12, -389564586); c = ff(c, d, a, b, x[i+ 2], 17, 606105819); b = ff(b, c, d, a, x[i+ 3], 22, -1044525330); a = ff(a, b, c, d, x[i+ 4], 7 , -176418897); d = ff(d, a, b, c, x[i+ 5], 12, 1200080426); c = ff(c, d, a, b, x[i+ 6], 17, -1473231341); b = ff(b, c, d, a, x[i+ 7], 22, -45705983); a = ff(a, b, c, d, x[i+ 8], 7 , 1770035416); d = ff(d, a, b, c, x[i+ 9], 12, -1958414417); c = ff(c, d, a, b, x[i+10], 17, -42063); b = ff(b, c, d, a, x[i+11], 22, -1990404162); a = ff(a, b, c, d, x[i+12], 7 , 1804603682); d = ff(d, a, b, c, x[i+13], 12, -40341101); c = ff(c, d, a, b, x[i+14], 17, -1502002290); b = ff(b, c, d, a, x[i+15], 22, 1236535329); a = gg(a, b, c, d, x[i+ 1], 5 , -165796510); d = gg(d, a, b, c, x[i+ 6], 9 , -1069501632); c = gg(c, d, a, b, x[i+11], 14, 643717713); b = gg(b, c, d, a, x[i+ 0], 20, -373897302); a = gg(a, b, c, d, x[i+ 5], 5 , -701558691); d = gg(d, a, b, c, x[i+10], 9 , 38016083); c = gg(c, d, a, b, x[i+15], 14, -660478335); b = gg(b, c, d, a, x[i+ 4], 20, -405537848); a = gg(a, b, c, d, x[i+ 9], 5 , 568446438); d = gg(d, a, b, c, x[i+14], 9 , -1019803690); c = gg(c, d, a, b, x[i+ 3], 14, -187363961); b = gg(b, c, d, a, x[i+ 8], 20, 1163531501); a = gg(a, b, c, d, x[i+13], 5 , -1444681467); d = gg(d, a, b, c, x[i+ 2], 9 , -51403784); c = gg(c, d, a, b, x[i+ 7], 14, 1735328473); b = gg(b, c, d, a, x[i+12], 20, -1926607734); a = hh(a, b, c, d, x[i+ 5], 4 , -378558); d = hh(d, a, b, c, x[i+ 8], 11, -2022574463); c = hh(c, d, a, b, x[i+11], 16, 1839030562); b = hh(b, c, d, a, x[i+14], 23, -35309556); a = hh(a, b, c, d, x[i+ 1], 4 , -1530992060); d = hh(d, a, b, c, x[i+ 4], 11, 1272893353); c = hh(c, d, a, b, x[i+ 7], 16, -155497632); b = hh(b, c, d, a, x[i+10], 23, -1094730640); a = hh(a, b, c, d, x[i+13], 4 , 681279174); d = hh(d, a, b, c, x[i+ 0], 11, -358537222); c = hh(c, d, a, b, x[i+ 3], 16, -722521979); b = hh(b, c, d, a, x[i+ 6], 23, 76029189); a = hh(a, b, c, d, x[i+ 9], 4 , -640364487); d = hh(d, a, b, c, x[i+12], 11, -421815835); c = hh(c, d, a, b, x[i+15], 16, 530742520); b = hh(b, c, d, a, x[i+ 2], 23, -995338651); a = ii(a, b, c, d, x[i+ 0], 6 , -198630844); d = ii(d, a, b, c, x[i+ 7], 10, 1126891415); c = ii(c, d, a, b, x[i+14], 15, -1416354905); b = ii(b, c, d, a, x[i+ 5], 21, -57434055); a = ii(a, b, c, d, x[i+12], 6 , 1700485571); d = ii(d, a, b, c, x[i+ 3], 10, -1894986606); c = ii(c, d, a, b, x[i+10], 15, -1051523); b = ii(b, c, d, a, x[i+ 1], 21, -2054922799); a = ii(a, b, c, d, x[i+ 8], 6 , 1873313359); d = ii(d, a, b, c, x[i+15], 10, -30611744); c = ii(c, d, a, b, x[i+ 6], 15, -1560198380); b = ii(b, c, d, a, x[i+13], 21, 1309151649); a = ii(a, b, c, d, x[i+ 4], 6 , -145523070); d = ii(d, a, b, c, x[i+11], 10, -1120210379); c = ii(c, d, a, b, x[i+ 2], 15, 718787259); b = ii(b, c, d, a, x[i+ 9], 21, -343485551); a = safe_add(a, olda); b = safe_add(b, oldb); c = safe_add(c, oldc); d = safe_add(d, oldd); } return rhex(a) + rhex(b) + rhex(c) + rhex(d); } |
|
From: Rob H. <for...@us...> - 2002-03-12 03:40:12
|
Update of /cvsroot/sandweb/sandweb/templates/js In directory usw-pr-cvs1:/tmp/cvs-serv24970/js Removed Files: md5.js Log Message: moving md5.js from templates/js into templates/ --- md5.js DELETED --- |
|
From: Rob H. <for...@us...> - 2002-03-11 21:24:40
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv15747/lib/SandWeb
Modified Files:
Repository.pm
Log Message:
repository->remove now forces by default
Index: Repository.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -U2 -r1.28 -r1.29
--- Repository.pm 11 Mar 2002 05:19:51 -0000 1.28
+++ Repository.pm 11 Mar 2002 20:35:19 -0000 1.29
@@ -433,7 +433,10 @@
if ($repo_type eq 'CVS') {
- %return = $vcs->remove(remove => $remove,
- recurse => $recurse,
- file => $file );
+ %return = $vcs->remove(
+ remove => $remove,
+ recurse => $recurse,
+ file => $file,
+ force => 'yes',
+ );
}
|
|
From: Rob H. <for...@us...> - 2002-03-11 21:24:38
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv15747/lib/SandWeb/Repository
Modified Files:
CVS.pm
Log Message:
repository->remove now forces by default
Index: CVS.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/CVS.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -U2 -r1.32 -r1.33
--- CVS.pm 11 Mar 2002 05:19:51 -0000 1.32
+++ CVS.pm 11 Mar 2002 20:35:20 -0000 1.33
@@ -417,4 +417,5 @@
my $recurse = $args{'recurse'};
my $file = $args{'file'};
+ my $force = $args{'force'};
my $root = $self->get_root();
@@ -422,5 +423,5 @@
my @param = 'remove';
- if ($delete) { push @param, " -f" };
+ if ($force) { push @param, " -f" };
if ($recurse) { push @param, " -R" };
|
|
From: Rob H. <for...@us...> - 2002-03-11 20:08:28
|
Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv1216/templates
Modified Files:
login.html
Log Message:
* md5 authentication checked in and enabled.
NOTE: you MUST change your password with sandweb-admin --passwd-user AND
make sure md5.js is installed in your apache's docroot.
Index: login.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/login.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- login.html 13 Feb 2002 09:19:03 -0000 1.6
+++ login.html 11 Mar 2002 19:43:41 -0000 1.7
@@ -1,2 +1,10 @@
+<script language="JavaScript" src="/md5.js"></script>
+<script language="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" />
@@ -6,5 +14,5 @@
</td>
<td width="80%" align="left">
- <input type="text" name="username" size="10" />
+ <input type="text" name="username" size="20" />
</td>
</tr>
@@ -13,12 +21,30 @@
Password :
</td>
+
+<!-- user type password here -->
<td width="80%" align="left">
- <input type="password" name="password" size="10" />
+ <input type="password" name="password1" size="20"
+ 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" value="<TMPL_VAR NAME=SALT>" />
+ </td>
+
</tr>
<tr>
<td width="20%" align="right">
<br />
- <input type="submit" name="Submit" value="Login" />
+ <input type="submit" name="Submit" value="Login"
+ onClick="updateHash(password, password1, salt)
+ password1.value='' "
+ />
</td>
<td width="80%" align="left">
|
|
From: Rob H. <for...@us...> - 2002-03-11 20:08:26
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv1216/lib/SandWeb
Modified Files:
Auth.pm
Log Message:
* md5 authentication checked in and enabled.
NOTE: you MUST change your password with sandweb-admin --passwd-user AND
make sure md5.js is installed in your apache's docroot.
Index: Auth.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Auth.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -U2 -r1.19 -r1.20
--- Auth.pm 10 Mar 2002 01:56:05 -0000 1.19
+++ Auth.pm 11 Mar 2002 19:43:40 -0000 1.20
@@ -49,4 +49,5 @@
my $username = $args{'username'};
my $password = $args{'password'};
+ my $salt = $args{'salt'};
my $log = $self->_logobj();
@@ -57,5 +58,5 @@
);
- my $verified = $flatfile->verify_password($username, $password, $self->_get_data_dir());
+ my $verified = $flatfile->verify_password($username, $password, $self->_get_data_dir(), $salt);
if ($verified) {
|
|
From: Rob H. <for...@us...> - 2002-03-11 20:08:26
|
Update of /cvsroot/sandweb/sandweb/templates/js In directory usw-pr-cvs1:/tmp/cvs-serv1216/templates/js Added Files: md5.js Log Message: * md5 authentication checked in and enabled. NOTE: you MUST change your password with sandweb-admin --passwd-user AND make sure md5.js is installed in your apache's docroot. --- NEW FILE --- /* * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message * Digest Algorithm, as defined in RFC 1321. * Copyright (C) Paul Johnston 1999 - 2002. * Code also contributed by Greg Holt * See http://pajhome.org.uk/site/legal.html for details. */ /* * Convert a 32-bit number to a hex string with ls-byte first */ var hex_chr = "0123456789abcdef"; function rhex(num) { var str = ""; for(var j = 0; j <= 3; j++) str += hex_chr.charAt((num >> (j * 8 + 4)) & 0x0F) + hex_chr.charAt((num >> (j * 8)) & 0x0F); return str; } /* * Convert a string to a sequence of 16-word blocks, stored as an array. * Append padding bits and the length, as described in the MD5 standard. */ function str2blks_MD5(str) { var nblk = ((str.length + 8) >> 6) + 1; // number of 16-word blocks var blks = new Array(nblk * 16); for(var i = 0; i < nblk * 16; i++) blks[i] = 0; for(var i = 0; i < str.length; i++) blks[i >> 2] |= str.charCodeAt(i) << ((i % 4) * 8); blks[i >> 2] |= 0x80 << ((i % 4) * 8); blks[nblk * 16 - 2] = str.length * 8; return blks; } /* * Add integers, wrapping at 2^32. This uses 16-bit operations internally * to work around bugs in some JS interpreters. */ function safe_add(x, y) { var lsw = (x & 0xFFFF) + (y & 0xFFFF); var msw = (x >> 16) + (y >> 16) + (lsw >> 16); return (msw << 16) | (lsw & 0xFFFF); } /* * Bitwise rotate a 32-bit number to the left */ function rol(num, cnt) { return (num << cnt) | (num >>> (32 - cnt)); } /* * These functions implement the basic operation for each round of the * algorithm. */ function cmn(q, a, b, x, s, t) { return safe_add(rol(safe_add(safe_add(a, q), safe_add(x, t)), s), b); } function ff(a, b, c, d, x, s, t) { return cmn((b & c) | ((~b) & d), a, b, x, s, t); } function gg(a, b, c, d, x, s, t) { return cmn((b & d) | (c & (~d)), a, b, x, s, t); } function hh(a, b, c, d, x, s, t) { return cmn(b ^ c ^ d, a, b, x, s, t); } function ii(a, b, c, d, x, s, t) { return cmn(c ^ (b | (~d)), a, b, x, s, t); } /* * Take a string and return the hex representation of its MD5. */ function calcMD5(str) { var x = str2blks_MD5(str); var a = 1732584193; var b = -271733879; var c = -1732584194; var d = 271733878; for(i = 0; i < x.length; i += 16) { var olda = a; var oldb = b; var oldc = c; var oldd = d; a = ff(a, b, c, d, x[i+ 0], 7 , -680876936); d = ff(d, a, b, c, x[i+ 1], 12, -389564586); c = ff(c, d, a, b, x[i+ 2], 17, 606105819); b = ff(b, c, d, a, x[i+ 3], 22, -1044525330); a = ff(a, b, c, d, x[i+ 4], 7 , -176418897); d = ff(d, a, b, c, x[i+ 5], 12, 1200080426); c = ff(c, d, a, b, x[i+ 6], 17, -1473231341); b = ff(b, c, d, a, x[i+ 7], 22, -45705983); a = ff(a, b, c, d, x[i+ 8], 7 , 1770035416); d = ff(d, a, b, c, x[i+ 9], 12, -1958414417); c = ff(c, d, a, b, x[i+10], 17, -42063); b = ff(b, c, d, a, x[i+11], 22, -1990404162); a = ff(a, b, c, d, x[i+12], 7 , 1804603682); d = ff(d, a, b, c, x[i+13], 12, -40341101); c = ff(c, d, a, b, x[i+14], 17, -1502002290); b = ff(b, c, d, a, x[i+15], 22, 1236535329); a = gg(a, b, c, d, x[i+ 1], 5 , -165796510); d = gg(d, a, b, c, x[i+ 6], 9 , -1069501632); c = gg(c, d, a, b, x[i+11], 14, 643717713); b = gg(b, c, d, a, x[i+ 0], 20, -373897302); a = gg(a, b, c, d, x[i+ 5], 5 , -701558691); d = gg(d, a, b, c, x[i+10], 9 , 38016083); c = gg(c, d, a, b, x[i+15], 14, -660478335); b = gg(b, c, d, a, x[i+ 4], 20, -405537848); a = gg(a, b, c, d, x[i+ 9], 5 , 568446438); d = gg(d, a, b, c, x[i+14], 9 , -1019803690); c = gg(c, d, a, b, x[i+ 3], 14, -187363961); b = gg(b, c, d, a, x[i+ 8], 20, 1163531501); a = gg(a, b, c, d, x[i+13], 5 , -1444681467); d = gg(d, a, b, c, x[i+ 2], 9 , -51403784); c = gg(c, d, a, b, x[i+ 7], 14, 1735328473); b = gg(b, c, d, a, x[i+12], 20, -1926607734); a = hh(a, b, c, d, x[i+ 5], 4 , -378558); d = hh(d, a, b, c, x[i+ 8], 11, -2022574463); c = hh(c, d, a, b, x[i+11], 16, 1839030562); b = hh(b, c, d, a, x[i+14], 23, -35309556); a = hh(a, b, c, d, x[i+ 1], 4 , -1530992060); d = hh(d, a, b, c, x[i+ 4], 11, 1272893353); c = hh(c, d, a, b, x[i+ 7], 16, -155497632); b = hh(b, c, d, a, x[i+10], 23, -1094730640); a = hh(a, b, c, d, x[i+13], 4 , 681279174); d = hh(d, a, b, c, x[i+ 0], 11, -358537222); c = hh(c, d, a, b, x[i+ 3], 16, -722521979); b = hh(b, c, d, a, x[i+ 6], 23, 76029189); a = hh(a, b, c, d, x[i+ 9], 4 , -640364487); d = hh(d, a, b, c, x[i+12], 11, -421815835); c = hh(c, d, a, b, x[i+15], 16, 530742520); b = hh(b, c, d, a, x[i+ 2], 23, -995338651); a = ii(a, b, c, d, x[i+ 0], 6 , -198630844); d = ii(d, a, b, c, x[i+ 7], 10, 1126891415); c = ii(c, d, a, b, x[i+14], 15, -1416354905); b = ii(b, c, d, a, x[i+ 5], 21, -57434055); a = ii(a, b, c, d, x[i+12], 6 , 1700485571); d = ii(d, a, b, c, x[i+ 3], 10, -1894986606); c = ii(c, d, a, b, x[i+10], 15, -1051523); b = ii(b, c, d, a, x[i+ 1], 21, -2054922799); a = ii(a, b, c, d, x[i+ 8], 6 , 1873313359); d = ii(d, a, b, c, x[i+15], 10, -30611744); c = ii(c, d, a, b, x[i+ 6], 15, -1560198380); b = ii(b, c, d, a, x[i+13], 21, 1309151649); a = ii(a, b, c, d, x[i+ 4], 6 , -145523070); d = ii(d, a, b, c, x[i+11], 10, -1120210379); c = ii(c, d, a, b, x[i+ 2], 15, 718787259); b = ii(b, c, d, a, x[i+ 9], 21, -343485551); a = safe_add(a, olda); b = safe_add(b, oldb); c = safe_add(c, oldc); d = safe_add(d, oldd); } return rhex(a) + rhex(b) + rhex(c) + rhex(d); } |
|
From: Rob H. <for...@us...> - 2002-03-11 20:08:25
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Auth
In directory usw-pr-cvs1:/tmp/cvs-serv1216/lib/SandWeb/Auth
Modified Files:
FlatFile.pm
Log Message:
* md5 authentication checked in and enabled.
NOTE: you MUST change your password with sandweb-admin --passwd-user AND
make sure md5.js is installed in your apache's docroot.
Index: FlatFile.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Auth/FlatFile.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- FlatFile.pm 10 Mar 2002 01:56:05 -0000 1.4
+++ FlatFile.pm 11 Mar 2002 19:43:41 -0000 1.5
@@ -22,4 +22,6 @@
package SandWeb::Auth::FlatFile;
+use Digest::MD5 qw(md5_hex);
+
sub new {
my $class = shift;
@@ -39,4 +41,6 @@
my $password = shift;
my $data_dir = shift;
+ my $another_salt = shift;
+
my $log = $self->_logobj();
open (PF, "< $data_dir/passwd") or
@@ -46,7 +50,10 @@
my ($real_username, $uid, $real_password) = split(':', $passwd_file);
if ($username eq $real_username) {
- my $salt = substr($real_password, 0, 2);
+# my $salt = substr($real_password, 0, 2);
chomp($real_password);
- if (crypt($password, $salt) ne $real_password) {
+# $log->debug("real_passwd:$real_password\n");
+# $log->debug("another_salt:$another_salt\n");
+# if (crypt($password, $salt) ne $real_password) {
+ if ($password ne md5_hex($real_password . $another_salt)) {
close PF;
return 0;
|
|
From: Rob H. <for...@us...> - 2002-03-11 20:08:15
|
Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv1216/bin
Modified Files:
sandweb-admin sandweb.cgi
Log Message:
* md5 authentication checked in and enabled.
NOTE: you MUST change your password with sandweb-admin --passwd-user AND
make sure md5.js is installed in your apache's docroot.
Index: sandweb-admin
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb-admin,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- sandweb-admin 10 Mar 2002 08:13:12 -0000 1.10
+++ sandweb-admin 11 Mar 2002 19:43:39 -0000 1.11
@@ -31,8 +31,10 @@
--add-user [name] : add a user account, specifying the name.
--remove-user [name] : remove existing user.
+ --passwd-user [name] : change a user's password.
=cut
use strict;
+use Digest::MD5 qw(md5_hex);
my $passwd_file = '../var/data/passwd';
@@ -54,4 +56,8 @@
exit 0;
}
+ elsif ($ARGV[0] eq '--passwd-user') {
+ passwd_user($ARGV[1]);
+ exit 0;
+ }
else {
syntax();
@@ -102,6 +108,7 @@
if ($tmp) {
#encrypt passwd
- my $salt = substr($tmp, 0, 2);
- $enc_pwd = crypt($tmp, $salt);
+# my $salt = substr($tmp, 0, 2);
+# $enc_pwd = crypt($tmp, $salt);
+ $enc_pwd = md5_hex($tmp);
}
else {
@@ -207,6 +214,49 @@
print " --add-user <username> : add a user\n";
print " --remove-user <username> : remove a user\n";
+ print " --passwd-user <username> : change a user's password\n";
print "\n";
}
+
+sub passwd_user {
+
+ # get password
+ my $name = shift;
+ print "Enter password for $name: ";
+ my $tmp = <STDIN>;
+ my $enc_pwd;
+ chomp ($tmp);
+ if ($tmp) {
+ $enc_pwd = md5_hex($tmp);
+ }
+ else {
+ fexit('24', "error: no password entered, aborting.");
+ }
+
+
+ open(PW, "<$passwd_file") or
+ fexit('31', "Unable to open $passwd_file : $!");
+ my @file = <PW>;
+ close PW;
+
+ my @o_file = ();
+ foreach my $line (@file) {
+ my ($un, $uid, $pw, $fn) = split(':', $line);
+ if ($un eq $name) {
+ $line = join (':', $un, $uid, $enc_pwd);
+ $line = $line . "\n";
+ }
+ push @o_file, $line;
+ }
+
+ open(PW, ">$passwd_file") or
+ fexit('32', "Unable to open $passwd_file : $!");
+ print PW join('', @o_file);
+ close PW;
+
+
+
+}
+
+
&main();
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.262
retrieving revision 1.263
diff -U2 -r1.262 -r1.263
--- sandweb.cgi 11 Mar 2002 05:19:51 -0000 1.262
+++ sandweb.cgi 11 Mar 2002 19:43:40 -0000 1.263
@@ -1,3 +1,4 @@
#!/usr/bin/perl -w
+# Sandweb CGI
#
# SandWeb (Web-based VCS client)
@@ -41,4 +42,5 @@
$progname =~ s:^.*/::;
+
# changeable global vars
my $config_file = 'sandweb.cfg';
@@ -97,7 +99,9 @@
my $username = CGI::param('username');
my $password = CGI::param('password');
+ my $salt = CGI::param('salt');
login(
username => $username,
password => $password,
+ salt => $salt,
);
} else {
@@ -422,8 +426,11 @@
$log->debug("entering login menu");
+ my $salt = rand(0xffffffff);
my $content = $ui->get_menu(
MENU => 'login',
PROGNAME => "$progname",
+#a salt here (for challenge)
+ SALT => $salt,
);
@@ -2403,4 +2410,5 @@
#
# args:
+# salt - current user's salt
# username - current user's attempted username
# password - current user's attempted password
@@ -2411,8 +2419,10 @@
my $username = $args{'username'} || 'null';
my $password = $args{'password'} || 'null';
+ my $salt = $args{'salt'} || 'null';
my $stat = $auth->login(
username => $username,
password => $password,
+ salt => $salt,
);
|
|
From: Rob H. <for...@us...> - 2002-03-11 19:07:12
|
Update of /cvsroot/sandweb/sandweb/templates/js In directory usw-pr-cvs1:/tmp/cvs-serv25028/js Log Message: Directory /cvsroot/sandweb/sandweb/templates/js added to the repository |
|
From: Rob H. <for...@us...> - 2002-03-11 05:19:55
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb In directory usw-pr-cvs1:/tmp/cvs-serv5646/lib/SandWeb Modified Files: Repository.pm Log Message: * tag implemented, also cleaned up some stuff w/ commit Index: Repository.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository.pm,v retrieving revision 1.27 retrieving revision 1.28 diff -U2 -r1.27 -r1.28 --- Repository.pm 10 Mar 2002 23:22:09 -0000 1.27 +++ Repository.pm 11 Mar 2002 05:19:51 -0000 1.28 @@ -494,5 +494,5 @@ check => $check, force => $force, - name => $name, + name => $name, file => $file, ); |
|
From: Rob H. <for...@us...> - 2002-03-11 05:19:54
|
Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv5646/bin
Modified Files:
sandweb.cgi
Log Message:
* tag implemented, also cleaned up some stuff w/ commit
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.261
retrieving revision 1.262
diff -U2 -r1.261 -r1.262
--- sandweb.cgi 11 Mar 2002 03:28:03 -0000 1.261
+++ sandweb.cgi 11 Mar 2002 05:19:51 -0000 1.262
@@ -1779,4 +1779,5 @@
my $location = $args{'location'};
my $message = CGI::param('message');
+ my $name = CGI::param('name');
my $username = $auth->get_username();
my $template_dir = $config->{'paths'}->{'template_dir'};
@@ -1865,5 +1866,53 @@
MENU_TITLE => 'SandWeb',
SUBMENU_TITLE => 'commit file(s)',
- PREVIOUS_URL => $prev_url,
+ FOOTER => '',
+ CONTENT => $content,
+ MESSAGE => $message,
+ );
+ exit 0;
+ }
+ if ( $vcs_command eq 'tag' ) {
+ if ($name) {
+ foreach my $file (@filename) {
+ %return = $repository->tag(
+ file => "$file",
+ name => "$name",
+ );
+ push (@vcs_output, "$return{'output'}\n");
+ push (@vcs_error, "$return{'error'}\n");
+ }
+
+ my $content = $ui->get_menu(
+ MENU => 'vcs_output',
+ LOCATION => $location,
+ FILENAME => @filename,
+ PROGNAME => $progname,
+ VCS_OUTPUT => join('', @vcs_output),
+ VCS_ERROR => join('', @vcs_error),
+ );
+
+ print CGI::header( -cookie => $ck_auth );
+ $ui->print_popup(
+ TITLE=> "SandWeb : VCS $vcs_command",
+ MENU_TITLE => 'SandWeb',
+ SUBMENU_TITLE => "VCS $vcs_command",
+ FOOTER => '',
+ CONTENT => $content,
+ MESSAGE => $message,
+ );
+ }
+ my $content = $ui->get_menu(
+ MENU => 'tag',
+ LOCATION => $location,
+ MODULE_NAME => $module_name,
+ REPO_NAME => $repo_name,
+ PROGNAME => $progname,
+ FILENAME => "@filename",
+ );
+ print CGI::header( -cookie => $ck_auth );
+ $ui->print_popup(
+ TITLE=> 'SandWeb : tag file(s)',
+ MENU_TITLE => 'SandWeb',
+ SUBMENU_TITLE => 'tag file(s)',
FOOTER => '',
CONTENT => $content,
|
|
From: Rob H. <for...@us...> - 2002-03-11 05:19:54
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv5646/lib/SandWeb/Repository
Modified Files:
CVS.pm
Log Message:
* tag implemented, also cleaned up some stuff w/ commit
Index: CVS.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/CVS.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -U2 -r1.31 -r1.32
--- CVS.pm 10 Mar 2002 01:56:05 -0000 1.31
+++ CVS.pm 11 Mar 2002 05:19:51 -0000 1.32
@@ -167,12 +167,13 @@
if ($recurse) { push @param, " -R" };
+ my $output;
+
if (!$message) {
- print "There must be a commit message.\n";
- return 0;
+ $output = "There must be a commit message.\n";
} else {
- push @param, " -m \"$message\""
+ push @param, " -m \"$message\"";
+ $output = `cd \"$sandbox\" && cvs -d $root @param \"$file\" 2>&1`;
};
- my $output = `cd \"$sandbox\" && cvs -d $root @param \"$file\" 2>&1`;
my $errorlevel = $?;
|
|
From: Rob H. <for...@us...> - 2002-03-11 05:19:54
|
Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv5646/templates
Modified Files:
commit.html tag.html
Log Message:
* tag implemented, also cleaned up some stuff w/ commit
Index: commit.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/commit.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- commit.html 7 Mar 2002 05:13:13 -0000 1.13
+++ commit.html 11 Mar 2002 05:19:51 -0000 1.14
@@ -2,5 +2,5 @@
<td width="center">
Please enter a commit message for <TMPL_VAR NAME=LOCATION>/<TMPL_VAR NAME=FILENAME> :
- <form submit="<TMPL_VAR NAME=PROGNAME>"">
+ <form submit="<TMPL_VAR NAME=PROGNAME>">
<input type="hidden" name="action" value="vcs" />
<input type="hidden" name="vcs_command" value="commit" />
Index: tag.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/tag.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- tag.html 7 Mar 2002 05:13:13 -0000 1.6
+++ tag.html 11 Mar 2002 05:19:51 -0000 1.7
@@ -2,12 +2,15 @@
<td width="100%">
<center>
- Please enter a symbolic name for REVISION# of <TMPL_VAR NAME=LOCATION>/<TMPL_VAR NAME=FILENAME> :
- <form submit="<TMPL_VAR NAME=FILENAME>" type="get">
- <input type="hidden" name="action" value="tag" />
+ Please enter a tag name for <TMPL_VAR NAME=LOCATION>/<TMPL_VAR NAME=FILENAME> :
+ <form submit="<TMPL_VAR NAME=PROGNAME>">
+ <input type="hidden" name="action" value="vcs" />
+ <input type="hidden" name="vcs_command" value="tag" />
<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 name="Submit" value="1" type="hidden" />
<input type="text" name="name" />
- <input type="submit" name="commit" value="Done" />
+ <input type="Submit" name="commit" value="Done" />
</form>
</center>
|
|
From: Rob H. <for...@us...> - 2002-03-11 03:28:07
|
Update of /cvsroot/sandweb/sandweb/bin In directory usw-pr-cvs1:/tmp/cvs-serv12162/bin Modified Files: sandweb.cgi Log Message: fixed "reload on commit" bug, prev_url shouldn't be specified for commit Index: sandweb.cgi =================================================================== RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v retrieving revision 1.260 retrieving revision 1.261 diff -U2 -r1.260 -r1.261 --- sandweb.cgi 10 Mar 2002 01:46:37 -0000 1.260 +++ sandweb.cgi 11 Mar 2002 03:28:03 -0000 1.261 @@ -1847,5 +1847,4 @@ MENU_TITLE => 'SandWeb', SUBMENU_TITLE => "VCS $vcs_command", - PREVIOUS_URL => $prev_url, FOOTER => '', CONTENT => $content, |
3 messages has been excluded from this view by a project administrator.
