sandweb-commit — CVS activity

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.316,1.317

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv18374/bin

Modified Files:
	sandweb.cgi 
Log Message:
view_file now checks to see if the current file exists or not.


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.316
retrieving revision 1.317
diff -U2 -r1.316 -r1.317
--- sandweb.cgi	15 Aug 2002 03:13:30 -0000	1.316
+++ sandweb.cgi	28 Aug 2002 00:13:03 -0000	1.317
@@ -267,5 +267,5 @@
 				}
 
-				if ( $vcs_command eq "branch" ) {
+  				if ( $vcs_command eq "branch" ) {
 					my $branch_sync = $cgi->param('branch_sync') || '';
 					my $branch_switch = $cgi->param('branch_switch') || '';
@@ -1100,5 +1100,9 @@
 	if ( $file->get_file_type() ne "Text" ) {
 		$log->debug("User wants to view non-text file : $filename");
-		set_message("This does not appear to be a text file.");
+		if ( $file->exists() ) {
+			set_message("This does not appear to be a text file.");
+		} else {
+			set_message("This file does not exist.");
+		}
 		$file_content = "";
 	} else {
@@ -1173,17 +1177,31 @@
 	);
 
-	my $menu = $ui->get_menu( 
-		MENU => 'view_file',
-		PROGNAME => "$progname",
-		MODULE_NAME => $module_name,
-		REPO_NAME => $repo_name,
-		FILENAME => "$filename",
-		LOCATION => "$location",
-		EDIT => "$edit",
-		FILE_CONTENT => "$file_content",
-		FILE_SIZE => $file->get_size(),
-		FILE_TYPE => $file->get_file_type(),
-		FILE_AGE => $file->get_age(),
-	);
+	my $menu;
+
+	if ( $file->exists() ) {
+		$menu = $ui->get_menu( 
+			MENU => 'view_file',
+			PROGNAME => "$progname",
+			MODULE_NAME => $module_name,
+			REPO_NAME => $repo_name,
+			FILENAME => "$filename",
+			LOCATION => "$location",
+			EDIT => "$edit",
+			FILE_CONTENT => "$file_content",
+			FILE_SIZE => $file->get_size(),
+			FILE_TYPE => $file->get_file_type(),
+			FILE_AGE => $file->get_age(),
+		);
+	} else {
+		$log->debug("User viewing file that does not exist : $location/$filename");
+		$menu = $ui->get_menu( 
+			MENU => 'output',
+			PROGNAME => "$progname",
+			FILENAME => "$filename",
+			LOCATION => "$location",
+			OUTPUT => "No such file.",
+		);
+	}		
+
 
 	my $popup_footer = $ui->get_menu( 

[Sandweb-commit] CVS: sandweb/lib/SandWeb/File Unix.pm,1.5,1.6

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/lib/SandWeb/File
In directory usw-pr-cvs1:/tmp/cvs-serv17665/lib/SandWeb/File

Modified Files:
	Unix.pm 
Log Message:
adding Security class, centralizes standard security checks for user input in SandWeb

Index: Unix.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/File/Unix.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- Unix.pm	14 Aug 2002 06:01:55 -0000	1.5
+++ Unix.pm	26 Aug 2002 06:59:47 -0000	1.6
@@ -27,4 +27,5 @@
 
 use SandWeb::Shell;
+use SandWeb::Security;
 
 sub new {
@@ -32,13 +33,19 @@
 	my %args = @_;
 
-	my $filename = $args{'filename'};
-	# Security check, no "/.." or "../" allowed mister!
-	
-	if ($filename) {
-        	$filename =~ s:/\.\.::g;
-        	$filename =~ s:\.\./::g;
-	}
+	my $unsafe_filename = $args{'filename'};
+	my $unsafe_location = $args{'location'};
+
+	# Security check
+	my $secure = SandWeb::Security->new();
+
+	my $filename = $secure->path( 
+		filename => "$unsafe_filename" 
+	);
+
+	my $location = $secure->path( 
+		filename => "$unsafe_location" 
+	);
+
 	my $log_obj = $args{'log_obj'};
-	my $location = $args{'location'};
 
 	my $raw_file_info = _shell(
@@ -185,4 +192,30 @@
 }
 
+sub exists {
+	my $self = shift;
+	my %args = @_;
+	my $location = $self->{'location'};
+	my $filename = $self->{'filename'};
+	my $contents = $args{'contents'};
+	my $log = $self->{'log_obj'};
+
+	$log->debug("checking for existence of file : $location/$filename");
+
+	my $exists = _shell(
+		method => 'execute',
+		command => "file \"$location/$filename\"",
+	);
+
+	my $return;
+
+	if ($exists =~ '(No such file or directory)') {
+		$return = 0;
+	} else {
+		$return = 1;
+	}
+
+	return $return;
+}
+
 sub create_file {
 	my $self = shift;
@@ -195,5 +228,5 @@
 	$log->debug("creating file : $location/$filename");
 
-	my $create_file = _shell(
+	my $return = _shell(
 		method => 'execute',
 		command => "touch \"$location/$filename\"",

[Sandweb-commit] CVS: sandweb/lib/SandWeb Security.pm,NONE,1.1 Browse.pm,1.78,1.79

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv17665/lib/SandWeb

Modified Files:
	Browse.pm 
Added Files:
	Security.pm 
Log Message:
adding Security class, centralizes standard security checks for user input in SandWeb

--- NEW FILE ---
#lib/SandWeb/Security.pm
#
# This class has methods to handle common perl/cgi security problems.
# 
#  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
#

package SandWeb::Security;

sub new {
	my $class = shift;
	my $self = bless {}, $class;

	return $self;
}

sub path {
	my $self = shift;
	my %args = @_;

	my $filename = $args{'filename'};

	# Security check, no "/.." or "../" allowed mister!
        
        if ($filename) {
                $filename =~ s:/\.\.::g;
                $filename =~ s:\.\./::g;
        }

        return $filename;
}

sub shell {
	my $self = shift;
	my %args = @_;

	my $characters = $args{'characters'};

	# Security check - escape unsafe characters
        $characters =~ s/([\<\>\\\&;\`\'\|\"*\?\~\^\(\)\[\]\{\}\$])/\\$1/g;

        return $characters;
}

1;

Index: Browse.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Browse.pm,v
retrieving revision 1.78
retrieving revision 1.79
diff -U2 -r1.78 -r1.79
--- Browse.pm	29 Jul 2002 17:41:41 -0000	1.78
+++ Browse.pm	26 Aug 2002 06:59:47 -0000	1.79
@@ -36,4 +36,5 @@
 
 use SandWeb::File;
+use SandWeb::Security;
 
 sub new {
@@ -66,5 +67,13 @@
 	my %args = @_;
 
-	my $location = $args{'location'};
+	my $unsafe_location = $args{'location'};
+
+	# Security check
+        my $secure = SandWeb::Security->new();
+
+        my $location = $secure->path(
+                filename => "$unsafe_location"
+        );
+
 	my $progname = $args{'progname'};
 	my $repo_type = $args{'repo_type'};
@@ -195,5 +204,13 @@
 	my @loop_data;
 
-	my $location = $args{'location'};
+	my $unsafe_location = $args{'location'};
+
+	# Security check
+        my $secure = SandWeb::Security->new();
+
+        my $location = $secure->path(
+                filename => "$unsafe_location"
+        );
+
 	my $progname = $args{'progname'};
 
@@ -224,5 +241,13 @@
 	my %args = @_;
 
-	my $location = $args{'location'};
+	my $unsafe_location = $args{'location'};
+
+	# Security check
+        my $secure = SandWeb::Security->new();
+
+        my $location = $secure->path(
+                filename => "$unsafe_location"
+        );
+
 	my $progname = $args{'progname'};
 
@@ -235,15 +260,5 @@
 	
 	my $count;
-	if ($location eq '/') {
-        	$location = '';
-	}
  
-	if ($location) {
-		# Security check, no "/.." or "../" allowed mister!
-		$location =~ s:/\.\.::g;
-		$location =~ s:\.\./::g;
-	} else {
-		$location = '';
-	}
 	my @location_link;
 	push (@location_link, split( /\//, $location ));

[Sandweb-commit] CVS: sandweb MANIFEST,1.13,1.14

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv17665

Modified Files:
	MANIFEST 
Log Message:
adding Security class, centralizes standard security checks for user input in SandWeb

Index: MANIFEST
===================================================================
RCS file: /cvsroot/sandweb/sandweb/MANIFEST,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- MANIFEST	21 Jul 2002 06:21:18 -0000	1.13
+++ MANIFEST	26 Aug 2002 06:59:47 -0000	1.14
@@ -24,4 +24,5 @@
 lib/SandWeb/Repository/cvs.pm
 lib/SandWeb/Shell.pm
+lib/SandWeb/Security.pm
 
 templates/file.html

[Sandweb-commit] CVS: sandweb/lib/SandWeb/Repository cvs.pm,1.31,1.32

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv17665/lib/SandWeb/Repository

Modified Files:
	cvs.pm 
Log Message:
adding Security class, centralizes standard security checks for user input in SandWeb

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	17 Aug 2002 02:14:26 -0000	1.31
+++ cvs.pm	26 Aug 2002 06:59:47 -0000	1.32
@@ -28,4 +28,5 @@
 use SandWeb::Diff;
 use SandWeb::Shell;
+use SandWeb::Security;
 
 sub new {
@@ -210,5 +211,5 @@
         my %params = @{ $args{'params'}[0] };
 	my $recurse = $params{'recurse'};
-	my $message = $params{'message'};
+	my $unsafe_message = $params{'message'};
 	my $rev = $params{'rev'};
 	my $date = $params{'date'};
@@ -224,10 +225,14 @@
 	my %return;
 
-	if (!$message) {
+	if (!$unsafe_message) {
 		$output = "There must be a commit message.\n";
 	} else {
 		
-		# Security check - escape unsafe characters
-		$message =~ s/([\<\>\\\&;\`\'\|\"*\?\~\^\(\)\[\]\{\}\$])/\\$1/g;
+		# Security check 
+		my $secure = SandWeb::Security->new();
+
+		my $message = $secure->shell(
+			characters => "$unsafe_message"
+		);
 
 		push @param, " -m \"$message\"";
@@ -558,7 +563,14 @@
 	my $force = $params{'force'};
 	my $check = $params{'check'};
-	my $name = $params{'name'};
+	my $unsafe_name = $params{'name'};
 	my $file = $params{'file'};
 
+	# Security check 
+	my $secure = SandWeb::Secure->new();
+
+	my $name = $secure->shell(
+		characters => "$unsafe_name"
+	);
+
 	my @param = 'tag';
 
@@ -573,7 +585,4 @@
 	$log->debug("Params: @param");
 	$log->debug("File: $file");
-
-	# Security check - escape unsafe characters
-	$name =~ s/([\<\>\\\&;\`\'\|\"*\?\~\^\(\)\[\]\{\}\$])/\\$1/g;
 
 	my %return = $self->shell( 

[Sandweb-commit] CVS: sandweb/lib/SandWeb/Repository cvs.pm,1.30,1.31

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv19875/lib/SandWeb/Repository

Modified Files:
	cvs.pm 
Log Message:
check for bad shell characters and escape them, for commit() and tag() methods ( the only ones that accept user input)

Index: cvs.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v
retrieving revision 1.30
retrieving revision 1.31
diff -U2 -r1.30 -r1.31
--- cvs.pm	16 Aug 2002 23:19:04 -0000	1.30
+++ cvs.pm	17 Aug 2002 02:14:26 -0000	1.31
@@ -227,5 +227,9 @@
 		$output = "There must be a commit message.\n";
 	} else {
-		push @param, " -m '$message'";
+		
+		# Security check - escape unsafe characters
+		$message =~ s/([\<\>\\\&;\`\'\|\"*\?\~\^\(\)\[\]\{\}\$])/\\$1/g;
+
+		push @param, " -m \"$message\"";
 		if ($log) {
 			$log->debug("Performing commit operation");
@@ -569,4 +573,7 @@
 	$log->debug("Params: @param");
 	$log->debug("File: $file");
+
+	# Security check - escape unsafe characters
+	$name =~ s/([\<\>\\\&;\`\'\|\"*\?\~\^\(\)\[\]\{\}\$])/\\$1/g;
 
 	my %return = $self->shell( 

[Sandweb-commit] CVS: sandweb/lib/SandWeb/Repository cvs.pm,1.29,1.30

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv6504/lib/SandWeb/Repository

Modified Files:
	cvs.pm 
Log Message:
fixed the commit bug, appears to have been a quoting issue in Repository/vcs.pm ... now uses single quotes instead of trying to pass double quotes through all those layers

Index: cvs.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v
retrieving revision 1.29
retrieving revision 1.30
diff -U2 -r1.29 -r1.30
--- cvs.pm	15 Aug 2002 08:00:16 -0000	1.29
+++ cvs.pm	16 Aug 2002 23:19:04 -0000	1.30
@@ -227,5 +227,5 @@
 		$output = "There must be a commit message.\n";
 	} else {
-		push @param, " -m \"$message\"";
+		push @param, " -m '$message'";
 		if ($log) {
 			$log->debug("Performing commit operation");

[Sandweb-commit] CVS: sandweb NEWS,1.3,1.4

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv22111

Modified Files:
	NEWS 
Log Message:
ugh, I somehow introduced a bug in SandWeb, I should stop working on SandWeb using SandWeb until it's fixed.. ugh. rolling NEWS back to r1.2

Index: NEWS
===================================================================
RCS file: /cvsroot/sandweb/sandweb/NEWS,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- NEWS	15 Aug 2002 08:17:05 -0000	1.3
+++ NEWS	15 Aug 2002 08:19:36 -0000	1.4
@@ -1,6 +1,4 @@
 2002-03-28
 
-meritorious
-
 	ALPHA version released. First release of SandWeb, hooray! 
 	This version only supports local CVS repositories, and
@@ -9,2 +7,3 @@
 
 	Tag name: release-ALPHA
+

[Sandweb-commit] CVS: sandweb NEWS,1.2,1.3 README,1.8,1.9

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv21021

Modified Files:
	NEWS README 
Log Message:
added

Index: NEWS
===================================================================
RCS file: /cvsroot/sandweb/sandweb/NEWS,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- NEWS	28 Mar 2002 07:28:43 -0000	1.2
+++ NEWS	15 Aug 2002 08:17:05 -0000	1.3
@@ -1,4 +1,6 @@
 2002-03-28
 
+meritorious
+
 	ALPHA version released. First release of SandWeb, hooray! 
 	This version only supports local CVS repositories, and
@@ -7,3 +9,2 @@
 
 	Tag name: release-ALPHA
-

Index: README
===================================================================
RCS file: /cvsroot/sandweb/sandweb/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- README	13 Aug 2002 19:13:34 -0000	1.8
+++ README	15 Aug 2002 08:17:05 -0000	1.9
@@ -14,4 +14,10 @@
 5.0 and Mozilla 1.0.0
 
+Please note that the common method for disabling "pop-up ads" in Mozilla,
+unchecking "Open unrequested windows" in the preferences, will cause the
+main SandWeb window to not be refreshed automatically. It's recommended that 
+you leave "Open unrequested windows" checked in Mozilla ( the default ) when 
+using SandWeb.
+
 The BETA release only supports "FlatFile" authentication, in
 which SandWeb uses it's own password file and format. More 
@@ -130,3 +136,3 @@
 the appropriate mailing list :
 
-http://sourceforge.net/mail/?group_id=25671
+http://sourceforge.net/mail/?group_id=25671
\ No newline at end of file

[Sandweb-commit] CVS: sandweb/templates repository.js,1.4,1.5

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv14195/templates

Modified Files:
	repository.js 
Log Message:
oops, did not mean to check hat stuff in

Index: repository.js
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/repository.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- repository.js	15 Aug 2002 08:00:17 -0000	1.4
+++ repository.js	15 Aug 2002 08:02:41 -0000	1.5
@@ -2,5 +2,5 @@
 	if (clicked == 'Delete') {
         if (confirm("Deleting this repository will also delete all modules checked out from this repository. Are you sure you wish to do this?")) {
-			return false;
+			return true;
         }
     }
@@ -8,20 +8,20 @@
 		if (isEmpty(document.repository.repo_name.value)) {
 			alert("Please enter a name for the repository.");
-			return true;
+			return false;
 		}
 		else if (isEmpty(document.repository.repo_server.value)) {
 			alert("Please enter a servername for the repository.");
-			return true;
+			return false;
 		}
 		else if (isEmpty(document.repository.repo_root.value)) {
 			alert("Please enter the root path to the repository.");
-			return true;
+			return false;
 		}
-		return false;
+		return true;
 	}
 	else {
-		return false;
+		return true;
     }
-	return true;
+	return false;
 }
 

[Sandweb-commit] CVS: sandweb/etc sandweb.cfg,1.25,1.26

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/etc
In directory usw-pr-cvs1:/tmp/cvs-serv14195/etc

Modified Files:
	sandweb.cfg 
Log Message:
oops, did not mean to check hat stuff in

Index: sandweb.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/etc/sandweb.cfg,v
retrieving revision 1.25
retrieving revision 1.26
diff -U2 -r1.25 -r1.26
--- sandweb.cfg	15 Aug 2002 08:00:16 -0000	1.25
+++ sandweb.cfg	15 Aug 2002 08:02:41 -0000	1.26
@@ -3,5 +3,5 @@
 
 	<!-- config tree for logging behavior -->
-	<logging debug="0" 
+	<logging debug="1" 
 		 log="1"
 	/>

[Sandweb-commit] CVS: sandweb install.cfg,1.19,1.20

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv14195

Modified Files:
	install.cfg 
Log Message:
oops, did not mean to check hat stuff in

Index: install.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/install.cfg,v
retrieving revision 1.19
retrieving revision 1.20
diff -U2 -r1.19 -r1.20
--- install.cfg	15 Aug 2002 08:00:15 -0000	1.19
+++ install.cfg	15 Aug 2002 08:02:41 -0000	1.20
@@ -2,14 +2,14 @@
 package config;
 
+$bindir = '/usr/local/bin';
 $cfgdir = '/usr/local/etc/sandweb';
-$cgidir = '/usr/lib/cgi-bin';
+$cgidir = '/var/www/cgi-bin';
 $tmpldir = '/usr/local/lib/sandweb/templates';
 $cachedir = '/usr/local/share/sandweb';
 $logdir = '/var/log';
-$httpuser = 'www-data';
+$httpuser = 'www';
 $expectbin = '/usr/bin/expect';
-$bindir = '/usr/local/bin';
-$ssh_bin = '/usr/local/bin/ssh';
+$ssh_bin = '/usr/bin/ssh';
 $cvs_bin = '/usr/bin/cvs';
 
-1;
+1;
\ No newline at end of file

[Sandweb-commit] CVS: sandweb/templates repository.js,1.3,1.4

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv13195/templates

Modified Files:
	repository.js 
Log Message:
lib/SandWeb/Repository/cvs.pm

Index: repository.js
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/repository.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- repository.js	14 Aug 2002 05:57:49 -0000	1.3
+++ repository.js	15 Aug 2002 08:00:17 -0000	1.4
@@ -2,5 +2,5 @@
 	if (clicked == 'Delete') {
         if (confirm("Deleting this repository will also delete all modules checked out from this repository. Are you sure you wish to do this?")) {
-			return true;
+			return false;
         }
     }
@@ -8,20 +8,20 @@
 		if (isEmpty(document.repository.repo_name.value)) {
 			alert("Please enter a name for the repository.");
-			return false;
+			return true;
 		}
 		else if (isEmpty(document.repository.repo_server.value)) {
 			alert("Please enter a servername for the repository.");
-			return false;
+			return true;
 		}
 		else if (isEmpty(document.repository.repo_root.value)) {
 			alert("Please enter the root path to the repository.");
-			return false;
+			return true;
 		}
-		return true;
+		return false;
 	}
 	else {
-		return true;
+		return false;
     }
-	return false;
+	return true;
 }
 

[Sandweb-commit] CVS: sandweb/lib/SandWeb/Repository cvs.pm,1.28,1.29

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository
In directory usw-pr-cvs1:/tmp/cvs-serv13195/lib/SandWeb/Repository

Modified Files:
	cvs.pm 
Log Message:
lib/SandWeb/Repository/cvs.pm

Index: cvs.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -U2 -r1.28 -r1.29
--- cvs.pm	24 Jun 2002 20:39:25 -0000	1.28
+++ cvs.pm	15 Aug 2002 08:00:16 -0000	1.29
@@ -646,4 +646,5 @@
 
 	my $raw_output = $return{'output'};
+	$raw_output =~ s/\r/\n/g;
 
 	my @lined_output = split(/\n/, $raw_output);

[Sandweb-commit] CVS: sandweb install.cfg,1.18,1.19

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb
In directory usw-pr-cvs1:/tmp/cvs-serv13195

Modified Files:
	install.cfg 
Log Message:
lib/SandWeb/Repository/cvs.pm

Index: install.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/install.cfg,v
retrieving revision 1.18
retrieving revision 1.19
diff -U2 -r1.18 -r1.19
--- install.cfg	13 Aug 2002 19:16:39 -0000	1.18
+++ install.cfg	15 Aug 2002 08:00:15 -0000	1.19
@@ -2,14 +2,14 @@
 package config;
 
-$bindir = '/usr/local/bin';
 $cfgdir = '/usr/local/etc/sandweb';
-$cgidir = '/var/www/cgi-bin';
+$cgidir = '/usr/lib/cgi-bin';
 $tmpldir = '/usr/local/lib/sandweb/templates';
 $cachedir = '/usr/local/share/sandweb';
 $logdir = '/var/log';
-$httpuser = 'www';
+$httpuser = 'www-data';
 $expectbin = '/usr/bin/expect';
-$ssh_bin = '/usr/bin/ssh';
+$bindir = '/usr/local/bin';
+$ssh_bin = '/usr/local/bin/ssh';
 $cvs_bin = '/usr/bin/cvs';
 
-1;
\ No newline at end of file
+1;

[Sandweb-commit] CVS: sandweb/etc sandweb.cfg,1.24,1.25

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/etc
In directory usw-pr-cvs1:/tmp/cvs-serv13195/etc

Modified Files:
	sandweb.cfg 
Log Message:
lib/SandWeb/Repository/cvs.pm

Index: sandweb.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/etc/sandweb.cfg,v
retrieving revision 1.24
retrieving revision 1.25
diff -U2 -r1.24 -r1.25
--- sandweb.cfg	20 May 2002 05:45:59 -0000	1.24
+++ sandweb.cfg	15 Aug 2002 08:00:16 -0000	1.25
@@ -3,5 +3,5 @@
 
 	<!-- config tree for logging behavior -->
-	<logging debug="1" 
+	<logging debug="0" 
 		 log="1"
 	/>

[Sandweb-commit] CVS: sandweb/lib/SandWeb Shell.pm,1.18,1.19

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv23883/lib/SandWeb

Modified Files:
	Shell.pm 
Log Message:
hmm.. stripping characters is bad for binaries :)


Index: Shell.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Shell.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -U2 -r1.18 -r1.19
--- Shell.pm	14 Jul 2002 08:31:37 -0000	1.18
+++ Shell.pm	15 Aug 2002 03:36:07 -0000	1.19
@@ -141,5 +141,4 @@
 	}
 
-	$output =~ s/\r/\n/g;
 	my $error_message;
 	if ($error) {

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.315,1.316

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv13909/bin

Modified Files:
	sandweb.cgi 
Log Message:
ack, broke the build :P needed a curly brace, not )


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.315
retrieving revision 1.316
diff -U2 -r1.315 -r1.316
--- sandweb.cgi	15 Aug 2002 01:09:17 -0000	1.315
+++ sandweb.cgi	15 Aug 2002 03:13:30 -0000	1.316
@@ -1885,5 +1885,5 @@
 	my $module_name = $args{'module_name'};
 	my $filename = $args{'filename'};
-	my $previous_url = $args{'previous_url');
+	my $previous_url = $args{'previous_url'};
 
 	$log->debug("creating File object");

[Sandweb-commit] CVS: CVSROOT cvswrappers,1.1,1.2

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/CVSROOT
In directory usw-pr-cvs1:/tmp/cvs-serv6096

Modified Files:
	cvswrappers 
Log Message:
added .jpg, .xcf, .png as binaries


Index: cvswrappers
===================================================================
RCS file: /cvsroot/sandweb/CVSROOT/cvswrappers,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- cvswrappers	20 Apr 2001 13:10:45 -0000	1.1
+++ cvswrappers	15 Aug 2002 02:58:06 -0000	1.2
@@ -22,2 +22,6 @@
 # For example:
 #*.gif -k 'b'
+
+*.png -k 'b'
+*.jpg -k 'b'
+*.xcf -k 'b'

[Sandweb-commit] CVS: sandweb/images create_folder.png,NONE,1.1 create_folder.xcf,NONE,1.1 delete.png,NONE,1.1 delete.xcf,NONE,1.1 font.txt,NONE,1.1 rename.png,NONE,1.1 rename.xcf,NONE,1.1 sandweb_button.xcf,NONE,1.1 upload.png,NONE,1.1 upload.xcf,NONE,1.1

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/images
In directory usw-pr-cvs1:/tmp/cvs-serv32650

Added Files:
	create_folder.png create_folder.xcf delete.png delete.xcf 
	font.txt rename.png rename.xcf sandweb_button.xcf upload.png 
	upload.xcf 
Log Message:
adding images, these aren't part of the build or anything yet, they are
just there.


--- NEW FILE ---
‰PNG


U€`Scÿ9ìÚÜþ™>ÌìÝÚÆÆÆk®¾Òiwg;óû}¿ùÍìܬ „Ýõõe@
ÌN(`hO:=€Ýõõ1`1ð80ˆD½™‡
RÊÜÙuƒnáqûöm2™[ܾ=<cއ“ U¥|c¸0ÓÞü@ãû¾‰
èí4³u+̤ñÐ0a8vìزó.lH&“o£Wc§ŠF`Ë$d6‡®·
äö™c­¹×®¿²²ò
GZBã¡'`J+BSفù `*Ljï탆É0+‡É0k‡»0«‡‰	˜­N€…^‚òÑ»-<ô¶“ÙöÁT€!´m³²Lá
--- NEW FILE ---
gimp xcf file








w)





v)





v)



--- NEW FILE ---
‰PNG


<	45kbžýЁä$ŒºL·ß¼
¬Äb1b±ñxœX,ÆÈȈ궥:¬
Nœ8ÁýÙiÉ8³÷î2qsŒ›ã·™»Ï;÷øì˯,¶T–…ÐjѰɇ'Y‹g£o]#­MÍLÝý››ã·-´0ëÆÛ ±¡¶–WOº
(
}1s1>ûöº.ýL°¥AzÈx	þf^ûéیžÈ)S@‡U
…Œûêmû9ó—ÎØ◿혳¯îB$´n¦ãÔ×R„gŸÎz‘“ª€Bn$¦†ùHÍfjaˆüøÎljäƒóßq×,òYª
YÈfò\Ò¹³›ÛgY12Ïrš,.L36›Ì,c3$
T›"_ìµ®›Þaï¿l`붗ìx¬-°C
;< ‚Ü}ÛoHÂêï\(1ñÃÀúl!p¸ìÎÌö\2»¢Ddƒæû.è³Å+ìÎ
j¶ƒH!v“AóÞmŽÝEV¸¥}ÅÂé¡`GÉRÆ*׏˜ít„#À„yÿ)ÄÅ}–Ãj˜@ݍœíWÌv5óJ	¤›GȺ¸šùröõY«=à"ðz	í¹„Žš—‚"^¨Ïr”%@9;0‚r(iï­ÓPª
--- NEW FILE ---
gimp xcf file


ÿú'ÿɉ
ÿö6ÿÿɉ
ÿöDàÿÿɉ
ÿòSÆàÿÿɉ
ÿ
SûG;0$
ÿôþýüûúðéÉ
þù‚öõÔ
ÿú'ÿɉ
ÿö6ÿÿɉ
ÿöDàÿÿɉ
ÿòSÆàÿÿɉ
ÿ
SûG;0$
ÿôýú÷õòçß¾
ÿõ'ÿɉ
ÿö6ÿÿɉ
ÿöDàÿÿɉ
ÿòSÆàÿÿɉ
ÿ
SûG;0$
ÿôüøôðëßÖµ

w)





v)





v)



--- NEW FILE ---
arial,bold,8 pts

--- NEW FILE ---
‰PNG


JWT°’¶NK¡¤!%)i³¹Yš4ŽÖéxÂaflg±g<v–~’å™yïýçû¾·Ì›å™ˆAmMÍM€0±41	ë\®1í€	 ¶¦F
Öí2Ì]A㙠„Š_Ý@çŽzÇÙÛ|„ÓcgiºÌØYYP’¿v0RÆ6a%ðÑ>tpÃ:"&¬Û¥‡fb
z
¯~±bƈ®ÕüUü¡Öãt8ÕÓ
€d8Ên%·ÜB‰³g!Å;r¡À^T€É"q®¯‡ýmn<¾3<^±‰gÞ}!î•C/tµ€<‡^¬`èëI–e³Bºùõ*þùè0ÞÀ%µçÓÞ¯‘ýa_‰Ån¥Äê ¹±…P÷Ȍx6s.¶á‚IÎÙ¡ÍÍéâ6>{ã~~§ªq¡»_íïž¿ÄðÎSÒÚW¡¥î'ƒ>~lnà‹Á=È~³´Œ<k͍-øü
@àØÌç-ÿ•æ³âæ\
ÊK4îkaôàïI‹ŸŽkǙ㨷EÕ¸Hɽ@nnnd» ÏÊÁ«øu8Ö=oñj+
_ؐ’ë÷µ‹ã\ëè
3+t
—†/³·ÕÍDŽŒÕš9'LÑ*«²óø§¿‡G^®¤1+™'$_–ed)Œ0gáoôêæ;tœðúùêûï㦷ùES'KI„—
ʋ
˜4MrEÑÐeÀ˜»›1ºæŽÙ¾Þ
Ôt˜V(/©}í}`Н뼃|Ÿ.9îu>Š…ø\Zý`idGþ.¼ç
AZýpydgèè0˜ãB2@Z»é®ÈNßoí~Á

ð
¯ŠI«¶5¢2¼ÔàE!æA!
Š`MDµz¬IÍût³:¦Œ†í11µš¾%&¿3&¦n¤¢hdAiöêI<hÍÙËÜiçé9Ÿnèm
½D›:(Ä*‰Ö¼“(i-ŸGÝߊR³^¢cHý´<Ú±ØqÀËÔV¤z[@SÉl‰³Kz{œ<±û³åÙN
?
7æ
™&i,{’’ùs± æôííbÃ\
X’âan,Yñp}–´xHlÀR]85f”ûxeQ¡„²´l©-˜ÒDÑFÑ<iVúQVTzՌê¹]
¡-œAÑÔÖßÎòZ:Û´×¹\絚îTÿý,£ÅÓ0m™ür\>ÿ?‡›’Nã_ß]
--- NEW FILE ---
gimp xcf file

Ï

ÿ2
ÿ
ÿ


w)





v)





v)



--- NEW FILE ---
gimp xcf file


w)





v)





v)



--- NEW FILE ---
‰PNG


™æ}¡`Œ@K_Ñ¥Ñ[D¤ZÃm#+‹¿§NBjŽ}#ƒ•2ŸUÐZ1Ýl1n·êÁ„%ÆWԁBo	…Âó{ѕa˜sRw‡T:?tvL
Z¡•b®Þ
	‰vÚ}vL
Lµ½¿Ú îTTÿ¿ÊHiπ/YU|=£¿]SVZ'/n_NCÁ´w3ÑskÄ;me19ãX£¢r/Jqý)`,ª3›´‚YlƒßGé«„ýÊFY%gK@\'n—%Š¤\`
;EG±#»ÐV畱3¡½Íh”Êmï3mõfÚúMÜxHŽ€Yì4ÅúñÙ¶²VGۋÞ¢÷ØèQWYuƒ±è9Õ¹¥D‘¤Ä$¬…·&ÿFÛïñMêÂë.8Ò^®³êÏÿK¤M@â«vÒØ;	æ­@ÞØ# oòÆ®'`[»Àvþ¹S°¶ôß۝†­БÆÃÖèXãas:Úxؘ€N
œz
ûýî%6¨P°¡e0ckã¬Í¯T”¹„¨Œon8ùkór;ü.»+t¶	ü1Y«=ŒGúQô\bOÚ0ùÝ>ÿ7Â`êÔS¸d
--- NEW FILE ---
gimp xcf file
Ï



þø*n¦&


"6*¾

õ&"
]dwj
f

62

x
rvN*
·± 
®¶z:2
´®¦r~y
æÖªr.
¯ª£œh
úÞº‚.ª¥ •‹x
þÚ²‚"¦ ›’h
úŽj
š‘x
ڒ^B
””{h
RR2
{xxh

w)





v)





v)

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.314,1.315

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv11689/bin

Modified Files:
	sandweb.cgi 
Log Message:
rename and create_folder now redirect to the main window properly, avoiding confusing side effects

Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.314
retrieving revision 1.315
diff -U2 -r1.314 -r1.315
--- sandweb.cgi	14 Aug 2002 01:35:48 -0000	1.314
+++ sandweb.cgi	15 Aug 2002 01:09:17 -0000	1.315
@@ -364,4 +364,5 @@
 						repo_name => $repo_name,
 						location => $location,
+						previous_url => $previous_url,
 					);
 				} else {
@@ -403,4 +404,5 @@
 						repo_name => $repo_name,
 						location => $location,
+						previous_url => $previous_url,
 					)
 				} else {
@@ -1311,4 +1313,5 @@
 	my $module_name = $args{'module_name'};
 	my $filename = $args{'filename'};
+	my $prev_url = "$ENV{'HTTP_REFERER'}";
 
 	$log->debug("viewing file : $filename");
@@ -1351,4 +1354,5 @@
 			LOCATION => $location,
 			FILENAME => $filename,
+			PREVIOUS_URL => $prev_url,
 		);
 
@@ -1429,4 +1433,5 @@
 	my $module_name = $args{'module_name'};
 	my $repo_name = $args{'repo_name'};
+	my $prev_url = "$ENV{'HTTP_REFERER'}";
 
 	my $content = $ui->get_menu( 
@@ -1436,4 +1441,5 @@
 		MODULE_NAME => $module_name,
 		REPO_NAME => $repo_name,
+		PREVIOUS_URL => $prev_url,
 	);
 	print $cgi->header( -cookie => $ck_auth );
@@ -1796,4 +1802,5 @@
 	my $filename = $args{'filename'};
 	my $tofile = $args{'tofile'};
+	my $previous_url = $args{'previous_url'};
 
 	my $file = SandWeb::File->new(
@@ -1810,10 +1817,5 @@
 	}
 
-	browse_module_menu( 
-		ck_auth => $ck_auth,
-		location => $location,
-		module_name => $module_name,
-		repo_name => $repo_name,
-	);
+	print $cgi->redirect("$previous_url");
 }
 
@@ -1883,4 +1885,5 @@
 	my $module_name = $args{'module_name'};
 	my $filename = $args{'filename'};
+	my $previous_url = $args{'previous_url');
 
 	$log->debug("creating File object");
@@ -1893,10 +1896,5 @@
 	$file->create_folder();
 
-	browse_module_menu( 
-		ck_auth => $ck_auth,
-		location => $location,
-		module_name => $module_name,
-		repo_name => $repo_name,
-	);
+	print $cgi->redirect("$previous_url");
 }
 

[Sandweb-commit] CVS: sandweb/templates create_folder.html,1.17,1.18 rename.html,1.4,1.5

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv11689/templates

Modified Files:
	create_folder.html rename.html 
Log Message:
rename and create_folder now redirect to the main window properly, avoiding confusing side effects

Index: create_folder.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/create_folder.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -U2 -r1.17 -r1.18
--- create_folder.html	13 Aug 2002 19:02:33 -0000	1.17
+++ create_folder.html	15 Aug 2002 01:09:17 -0000	1.18
@@ -9,4 +9,5 @@
 <input name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" type="hidden" />
 <input name="repo_name" value="<TMPL_VAR NAME=REPO_NAME>" type="hidden" />
+<input name="previous_url" value="<TMPL_VAR NAME=PREVIOUS_URL>" type="hidden" />
 <input name="Submit" value="1" type="hidden" />
 Enter foldername:<br />

Index: rename.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/rename.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- rename.html	13 Aug 2002 19:02:34 -0000	1.4
+++ rename.html	15 Aug 2002 01:09:17 -0000	1.5
@@ -9,4 +9,5 @@
     <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="previous_url" value="<TMPL_VAR NAME=PREVIOUS_URL>" type="hidden" />
     <input name="Submit" value="1" type="hidden" />
     <input type="text" name="tofile" />

[Sandweb-commit] CVS: sandweb/lib/SandWeb/File Unix.pm,1.4,1.5

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/lib/SandWeb/File
In directory usw-pr-cvs1:/tmp/cvs-serv31060/lib/SandWeb/File

Modified Files:
	Unix.pm 
Log Message:
checks for null ( so tests don't fail )


Index: Unix.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/File/Unix.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- Unix.pm	31 Jul 2002 19:46:30 -0000	1.4
+++ Unix.pm	14 Aug 2002 06:01:55 -0000	1.5
@@ -49,12 +49,12 @@
 	my @file_info = split(' ', $raw_file_info);
 	
-	my $perms = $file_info[0];
-	my $inodes = $file_info[1];
-	my $owner = $file_info[2];
-	my $group = $file_info[3];
-	my $size = $file_info[4];
-	my $month = $file_info[5];
-	my $day = $file_info[6];
-	my $time = $file_info[7];
+	my $perms = $file_info[0] || '';
+	my $inodes = $file_info[1] || '';
+	my $owner = $file_info[2] || '';
+	my $group = $file_info[3] || '';
+	my $size = $file_info[4] || '';
+	my $month = $file_info[5] || '';
+	my $day = $file_info[6] || '';
+	my $time = $file_info[7] || '';
 
 	my $self = bless {

[Sandweb-commit] CVS: sandweb/templates repository.js,1.2,1.3

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv29582/templates

Modified Files:
	repository.js 
Log Message:
oops, didn't mean to check my hack in

Index: repository.js
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/repository.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- repository.js	13 Aug 2002 19:02:34 -0000	1.2
+++ repository.js	14 Aug 2002 05:57:49 -0000	1.3
@@ -2,5 +2,5 @@
 	if (clicked == 'Delete') {
         if (confirm("Deleting this repository will also delete all modules checked out from this repository. Are you sure you wish to do this?")) {
-			return false;
+			return true;
         }
     }
@@ -8,20 +8,20 @@
 		if (isEmpty(document.repository.repo_name.value)) {
 			alert("Please enter a name for the repository.");
-			return true;
+			return false;
 		}
 		else if (isEmpty(document.repository.repo_server.value)) {
 			alert("Please enter a servername for the repository.");
-			return true;
+			return false;
 		}
 		else if (isEmpty(document.repository.repo_root.value)) {
 			alert("Please enter the root path to the repository.");
-			return true;
+			return false;
 		}
-		return false;
+		return true;
 	}
 	else {
-		return false;
+		return true;
     }
-	return true;
+	return false;
 }
 

[Sandweb-commit] CVS: sandweb/t file.t,1.2,1.3 repository.t,1.7,1.8

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/t
In directory usw-pr-cvs1:/tmp/cvs-serv18103

Modified Files:
	file.t repository.t 
Log Message:
corrected tests!


Index: file.t
===================================================================
RCS file: /cvsroot/sandweb/sandweb/t/file.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- file.t	28 Mar 2002 03:30:05 -0000	1.2
+++ file.t	14 Aug 2002 02:13:56 -0000	1.3
@@ -55,5 +55,8 @@
 # test 7
 
-ok( $file->create_file( contents => 'test' ) );
+$create_test = $file->create_file( contents => 'test');
+unless ($create_test{'error'}) {
+	ok(1);
+}
 
 # test 8

Index: repository.t
===================================================================
RCS file: /cvsroot/sandweb/sandweb/t/repository.t,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- repository.t	8 May 2002 02:39:56 -0000	1.7
+++ repository.t	14 Aug 2002 02:13:56 -0000	1.8
@@ -32,5 +32,7 @@
 
 my %test = $repository->checkout( file => 'sandbox' );
-ok( $test{'errorlevel'} );
+unless ($test{'errorlevel'}) {
+	ok(1);
+}
 
 # test 5
@@ -49,5 +51,7 @@
 
 %test = $repository->add( file => 'sandbox/testfile.c' );
-ok( $test{'errorlevel'} );
+unless ($test{'errorlevel'}) {
+	ok(1);
+}
 
 # test 9
@@ -57,5 +61,7 @@
 	message => 'test add',
 );
-ok( $test{'errorlevel'} );
+unless ($test{'errorlevel'}) {
+	ok(1);
+}
 
 # test 10
@@ -74,5 +80,7 @@
 	file => 'sandbox/testfile.c',
 );
-ok( $test{'errorlevel'} );
+unless ($test{'errorlevel'}) {
+	ok(1);
+}
 
 # test 12
@@ -82,5 +90,7 @@
 	message => 'test remove',
 );
-ok( $test{'errorlevel'} );
+unless ($test{'errorlevel'}) {
+	ok(1);
+}
 
 # cleanup section