[Fusionforge-commits] FusionForge branch 6.1 updated. v6.1beta1-114-gb504b7e

Franck Villaume nerville at libremir.placard.fr.eu.org
Wed Jan 31 04:30:06 CET 2018


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, 6.1 has been updated
       via  b504b7efaa9bc2ec2dc7857dee062235239b0f2b (commit)
       via  bdf56b7c4343275c181e65e1f2846891f9e54d9a (commit)
       via  42a11c7e22455f546e9993ce611d4b2849111581 (commit)
      from  29c7812d37c7eed86a43611d251b8f529be18f6b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=b504b7efaa9bc2ec2dc7857dee062235239b0f2b

commit b504b7efaa9bc2ec2dc7857dee062235239b0f2b
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Jan 31 04:29:15 2018 +0100

    if use_shell_limited is set, cannot modify the default user shell. does not make any sense

diff --git a/src/www/admin/useredit.php b/src/www/admin/useredit.php
index e1bc2e5..a743ad4 100644
--- a/src/www/admin/useredit.php
+++ b/src/www/admin/useredit.php
@@ -61,7 +61,7 @@ if (getStringFromRequest('delete_user') != '') {
 	}
 } elseif (getStringFromRequest('action') == "update_user" && getStringFromRequest('delete_user') == '') {
 	$email = getStringFromRequest('email');
-	$shell = getStringFromRequest('shell');
+	$shell = getStringFromRequest('shell', forge_get_config('user_default_shell'));
 	$status = getStringFromRequest('status');
 	$addToProjectArray =getStringFromRequest('group_id_add_member');
 
@@ -194,7 +194,7 @@ echo html_build_select_box_from_arrays(
 		<?php echo $unix_status2str[$u->getUnixStatus()]; ?>
 	</td>
 </tr>
-
+<?php if (!forge_get_config('use_shell_limited')) { ?>
 <tr>
 	<td>
         <label for="unix-shell"><?php echo _('Unix Shell:'); ?></label>
@@ -206,6 +206,7 @@ echo html_build_select_box_from_arrays(
     </td>
 </tr>
 <?php
+		}
 	}  // end of sys_use_shell conditional
 ?>
 

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=bdf56b7c4343275c181e65e1f2846891f9e54d9a

commit bdf56b7c4343275c181e65e1f2846891f9e54d9a
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Jan 31 04:28:37 2018 +0100

    limited_ssh.sh must be executable

diff --git a/src/bin/limited_ssh.sh b/src/bin/limited_ssh.sh
old mode 100644
new mode 100755

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=42a11c7e22455f546e9993ce611d4b2849111581

commit 42a11c7e22455f546e9993ce611d4b2849111581
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Jan 31 04:28:22 2018 +0100

    fix packaging for use_shell_limited feature. avoid support only src installation

diff --git a/src/common/include/User.class.php b/src/common/include/User.class.php
index f1e449b..ba8f1db 100644
--- a/src/common/include/User.class.php
+++ b/src/common/include/User.class.php
@@ -1248,7 +1248,7 @@ class FFUser extends FFError {
 		$now = time();
 		$explodedKey = explode(' ', $key);
 		if (forge_get_config('use_shell_limited')) {
-			$key = preg_replace("/^.*ssh-/", "command=\"\/usr\/local\/bin\/limited_ssh.sh\" ssh-", $key);
+			$key = preg_replace("/^.*ssh-/", "command=\"".forge_get_config('bin_path')."/limited_ssh.sh\" ssh-", $key);
 		}
 		$existingKeys = $this->getAuthorizedKeys();
 		foreach ($existingKeys as $existingKey) {
diff --git a/src/post-install.d/common/ini.sh b/src/post-install.d/common/ini.sh
index d8d7923..a7f9088 100755
--- a/src/post-install.d/common/ini.sh
+++ b/src/post-install.d/common/ini.sh
@@ -34,7 +34,7 @@ case "$1" in
 	hostname=$(hostname -f || hostname)
 	if [ ! -e $DESTDIR$config_path/config.ini.d/post-install.ini ]; then \
 	    sed $source_path/templates/post-install.ini \
-		-e "s, at web_host@,$hostname," \
+		-e "s, at web_host@,$hostname," -e ", at bin_dir@,$bindir," \
 		> $DESTDIR$config_path/config.ini.d/post-install.ini; \
 	fi
 
diff --git a/src/templates/post-install.ini b/src/templates/post-install.ini
index d185cac..2b1e187 100644
--- a/src/templates/post-install.ini
+++ b/src/templates/post-install.ini
@@ -2,3 +2,4 @@
 ; You can edit the values here or move them to other files.
 [core]
 web_host=@web_host@
+bin_dir=@bin_dir@

-----------------------------------------------------------------------

Summary of changes:
 src/bin/limited_ssh.sh            | 0
 src/common/include/User.class.php | 2 +-
 src/post-install.d/common/ini.sh  | 2 +-
 src/templates/post-install.ini    | 1 +
 src/www/admin/useredit.php        | 5 +++--
 5 files changed, 6 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 src/bin/limited_ssh.sh


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list