Skip to content

Commit fd5a162

Browse files
jnorelljnorell
committed
add jailkit_hardlinks server config setting
1 parent c248946 commit fd5a162

30 files changed

+166
-26
lines changed

‎install/tpl/server.ini.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ jailkit_chroot_app_sections=basicshell editors extendedshell netutils ssh sftp s
146146
jailkit_chroot_app_programs=/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico /usr/bin/mysql /usr/bin/mysqldump /usr/bin/git /usr/bin/git-receive-pack /usr/bin/git-upload-pack /usr/bin/unzip /usr/bin/zip /bin/tar /bin/rm /usr/bin/patch /usr/bin/which /usr/lib/x86_64-linux-gnu/libmemcached.so.11 /usr/lib/x86_64-linux-gnu/libmemcachedutil.so.2 /usr/lib/x86_64-linux-gnu/libMagickWand-6.Q16.so.2 /opt/php-5.6.8/bin/php /opt/php-5.6.8/include /opt/php-5.6.8/lib
147147
jailkit_chroot_cron_programs=/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php
148148
jailkit_chroot_authorized_keys_template=/root/.ssh/authorized_keys
149+
jailkit_hardlinks=allow
149150

150151
[vlogger]
151152
config_dir=/etc

‎interface/web/admin/form/server_config.tform.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1845,6 +1845,16 @@
18451845
'width' => '40',
18461846
'maxlength' => '1000'
18471847
),
1848+
'jailkit_hardlinks' => array(
1849+
'datatype' => 'VARCHAR',
1850+
'formtype' => 'SELECT',
1851+
'default' => 'allow',
1852+
'value' => array(
1853+
'allow' => 'jailkit_hardlinks_allow_txt',
1854+
'no' => 'jailkit_hardlinks_no_txt',
1855+
'yes' => 'jailkit_hardlinks_yes_txt',
1856+
)
1857+
),
18481858
//#################################
18491859
// END Datatable fields
18501860
//#################################

‎interface/web/admin/lib/lang/ar_server_config.lng‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,4 +320,8 @@ $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
320320
$wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
321321
$wb["jailkit_chroot_authorized_keys_template_txt"] = 'Jailkit authorized_keys template';
322322
$wb['jailkit_chroot_authorized_keys_template_error_regex'] = 'Invalid jaikit chroot authorized_keys template file.';
323-
?>
323+
$wb['jailkit_hardlinks_txt'] = 'Hardlinks within Jailkit chroot';
324+
$wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves disk space.';
325+
$wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
326+
$wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
327+
$wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';

‎interface/web/admin/lib/lang/bg_server_config.lng‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,4 +320,8 @@ $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
320320
$wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
321321
$wb["jailkit_chroot_authorized_keys_template_txt"] = 'Jailkit authorized_keys template';
322322
$wb['jailkit_chroot_authorized_keys_template_error_regex'] = 'Invalid jaikit chroot authorized_keys template file.';
323-
?>
323+
$wb['jailkit_hardlinks_txt'] = 'Hardlinks within Jailkit chroot';
324+
$wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves disk space.';
325+
$wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
326+
$wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
327+
$wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';

‎interface/web/admin/lib/lang/br_server_config.lng‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,3 +321,8 @@ $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
321321
$wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
322322
$wb["jailkit_chroot_authorized_keys_template_txt"] = 'Jailkit authorized_keys template';
323323
$wb['jailkit_chroot_authorized_keys_template_error_regex'] = 'Invalid jaikit chroot authorized_keys template file.';
324+
$wb['jailkit_hardlinks_txt'] = 'Hardlinks within Jailkit chroot';
325+
$wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves disk space.';
326+
$wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
327+
$wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
328+
$wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';

‎interface/web/admin/lib/lang/ca_server_config.lng‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,4 +320,8 @@ $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
320320
$wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
321321
$wb["jailkit_chroot_authorized_keys_template_txt"] = 'Jailkit authorized_keys template';
322322
$wb['jailkit_chroot_authorized_keys_template_error_regex'] = 'Invalid jaikit chroot authorized_keys template file.';
323-
?>
323+
$wb['jailkit_hardlinks_txt'] = 'Hardlinks within Jailkit chroot';
324+
$wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves disk space.';
325+
$wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
326+
$wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
327+
$wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';

‎interface/web/admin/lib/lang/cz_server_config.lng‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,4 +320,8 @@ $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
320320
$wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
321321
$wb["jailkit_chroot_authorized_keys_template_txt"] = 'Jailkit authorized_keys template';
322322
$wb['jailkit_chroot_authorized_keys_template_error_regex'] = 'Invalid jaikit chroot authorized_keys template file.';
323-
?>
323+
$wb['jailkit_hardlinks_txt'] = 'Hardlinks within Jailkit chroot';
324+
$wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves disk space.';
325+
$wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
326+
$wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
327+
$wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';

‎interface/web/admin/lib/lang/de_server_config.lng‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,4 +320,8 @@ $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
320320
$wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
321321
$wb["jailkit_chroot_authorized_keys_template_txt"] = 'Jailkit authorized_keys template';
322322
$wb['jailkit_chroot_authorized_keys_template_error_regex'] = 'Invalid jaikit chroot authorized_keys template file.';
323-
?>
323+
$wb['jailkit_hardlinks_txt'] = 'Hardlinks within Jailkit chroot';
324+
$wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves disk space.';
325+
$wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
326+
$wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
327+
$wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';

‎interface/web/admin/lib/lang/dk_server_config.lng‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,4 +320,8 @@ $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
320320
$wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
321321
$wb["jailkit_chroot_authorized_keys_template_txt"] = 'Jailkit authorized_keys template';
322322
$wb['jailkit_chroot_authorized_keys_template_error_regex'] = 'Invalid jaikit chroot authorized_keys template file.';
323-
?>
323+
$wb['jailkit_hardlinks_txt'] = 'Hardlinks within Jailkit chroot';
324+
$wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves disk space.';
325+
$wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
326+
$wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
327+
$wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';

‎interface/web/admin/lib/lang/el_server_config.lng‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,4 +320,8 @@ $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
320320
$wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
321321
$wb["jailkit_chroot_authorized_keys_template_txt"] = 'Jailkit authorized_keys template';
322322
$wb['jailkit_chroot_authorized_keys_template_error_regex'] = 'Invalid jaikit chroot authorized_keys template file.';
323-
?>
323+
$wb['jailkit_hardlinks_txt'] = 'Hardlinks within Jailkit chroot';
324+
$wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves disk space.';
325+
$wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
326+
$wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
327+
$wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';

0 commit comments

Comments
 (0)