Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WWSympa: Features of archives and shared repository should be able to be disabled #555

Merged
merged 4 commits into from
Feb 28, 2019
Merged

WWSympa: Features of archives and shared repository should be able to be disabled #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
517a5fa
[bug] Even if process_archive parameter is "off", items about archivi…
ikedas Feb 20, 2019
8273187
[feature] New parameter shared_feature in sympa.conf/robot.conf to en…
ikedas Feb 20, 2019
7d5e172
Disable actions related to shared repository if it was disabled.
ikedas Feb 20, 2019
78d7632
Make shared_feature to be "off" by default.
ikedas Feb 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion default/web_tt2/admin.tt2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
[%~ END ~%]
[% END %]

[% IF is_listmaster || is_owner %]
[% IF is_shared_allowed && (is_listmaster || is_owner) %]
<form name="manage_shared_status" action="[% path_cgi %]" method="post">
<div>
[% IF shared == 'none' %]
Expand Down
4 changes: 2 additions & 2 deletions default/web_tt2/list_menu.tt2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
[% IF action == 'modindex' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
<li class="[% class %]"><a href="[% 'modindex' | url_rel([list]) %]">[%|loc%]Message[%END%] ([% mod_message %]) </a></li>
[% IF action == 'docindex' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
[% IF shared == 'exist' ~%]
[% IF is_shared_allowed && shared == 'exist' ~%]
<li class="[% class %]"><a href="[% 'docindex' | url_rel([list]) %]">[%|loc%]Document[%END%] ([% mod_total_shared %])</a></li>
[%~ END %]
[% END %]
Expand Down Expand Up @@ -143,7 +143,7 @@
<li class="[% class %]"><a href="[% 'rss_request' | url_rel([list]) %]" >[%|loc%]RSS[%END%]</a></li>
[% END %]

[% IF shared == 'exist' %]
[% IF is_shared_allowed && shared == 'exist' %]
[% IF may_d_read %]
[% IF action == 'd_read' || action == 'd_edit' || action == 'd_properties' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
<li class="[% class %]"><a href="[% 'd_read' | url_rel([list,'']) %]" >[%|loc%]Shared documents[%END%]</a></li>
Expand Down
22 changes: 20 additions & 2 deletions src/cgi/wwsympa.fcgi.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1516,7 +1516,7 @@ while ($query = CGI::Fast->new) {

check_param_in();

unless ($comm{$action}) {
if (not $comm{$action} or _is_action_disabled($action)) {
# Previously we searched the list using value of action here.
# To prevent sniffing lists, we no longer do.
Sympa::WWW::Report::reject_report_web('user',
Expand Down Expand Up @@ -2975,7 +2975,7 @@ sub check_param_out {
# SJS END

## Archives Access control
if (defined $list->{'admin'}{'archive'}) {
if (defined $list->is_archiving_enabled) {
$param->{'is_archived'} = 1;

## Check if the current user may access web archives
Expand Down Expand Up @@ -3011,6 +3011,9 @@ sub check_param_out {
}
}

if (Conf::get_robot_conf($robot, 'shared_feature') eq 'on') {
$param->{'is_shared_allowed'} = 1;

# Shared documents access control.
my $shared_doc = Sympa::WWW::SharedDocument->new($list);
if ($shared_doc and $shared_doc->{status} eq 'exist') {
Expand All @@ -3024,6 +3027,7 @@ sub check_param_out {
);
$param->{'shared_public_access'} = $access{'may'}{'read'};
}
}

# List included in other list may not be closed nor renamed.
$param->{'is_included'} = 1 if $list->is_included;
Expand Down Expand Up @@ -17281,6 +17285,20 @@ sub do_delete_account {
}
}

sub _is_action_disabled {
my $action = shift;

unless (Conf::get_robot_conf($robot, 'shared_feature') eq 'on') {
return 1
if grep { $action eq $_ }
qw(d_admin d_change_access d_control d_create_child d_delete
d_describe d_editfile d_install_shared d_properties d_read
d_reject_shared d_rename d_set_owner d_unzip d_update);
}

return undef;
}

sub prevent_visibility_bypass {
wwslog('debug2', 'Starting');
if (defined $list and ref $list eq 'Sympa::List') {
Expand Down
9 changes: 9 additions & 0 deletions src/lib/Sympa/ConfDef.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1682,6 +1682,15 @@ our @params = (

# Shared document repository

{ 'name' => 'shared_feature',
'gettext_id' => 'Enable shared repository',
'gettext_comment' =>
'If set to "on", list owners can open shared repository.',
'vhost' => '1',
'edit' => '1',
'default' => 'off',
},

{ 'name' => 'default_shared_quota',
'optional' => '1',
'gettext_id' => 'Default disk quota for shared repository',
Expand Down
11 changes: 11 additions & 0 deletions src/lib/Sympa/Upgrade.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2045,6 +2045,17 @@ sub upgrade {
}
}

# Previously shared repository could not be disabled.
if (lower_version($previous_version, '6.2.41b.2')) {
my $human_date = $language->gettext_strftime('%d %b %Y at %H:%M:%S',
localtime time);

open my $ofh, '>>', Conf::get_sympa_conf();
printf $ofh "\n\n# Upgrade from %s to %s\n# %s\nshared_feature on\n",
$previous_version, $new_version, $human_date;
close $ofh;
}

return 1;
}

Expand Down