smecontribs/smeserver-BackupPC
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: smecontribs:0_2-19_el8_sme
Branches Tags
smecontribs:master
smecontribs:0_2-21_el8_sme smecontribs:0_2-20_el8_sme smecontribs:0_2-19_el8_sme smecontribs:0_2-18_el8_sme smecontribs:0.2-17.el8.sme smecontribs:0.2-16
...
compare: smecontribs:master
Branches Tags
smecontribs:master
smecontribs:0_2-21_el8_sme smecontribs:0_2-20_el8_sme smecontribs:0_2-19_el8_sme smecontribs:0_2-18_el8_sme smecontribs:0.2-17.el8.sme smecontribs:0.2-16

2 Commits
0_2-19_el8 ... master

Author SHA1 Message Date
Brian Read
ec6b312c35 * Sun Oct 05 2025 Brian Read <brianr@koozali.org> 0.2-21.sme 
- Add UTF8 and avoid potential DB caching problems [SME: 13209]
 2025-10-05 11:34:03 +01:00
Jean-Philippe Pialasse
61580fe3c7 * Wed Sep 24 2025 Jean-Philippe Pialasse <jpp@koozali.org> 0.2-20.sme 
- relaxed CSP
 2025-09-24 15:45:33 -04:00
3 changed files with 28 additions and 50 deletions
Expand all files Collapse all files

1
root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28BackupPCProxyPass
View File

@@ -22,6 +22,7 @@
<Location /BackupPC>
SSLRequireSSL on
Require ip $localAccess $externalSSLAccess
Header set Content-Security-Policy "script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'
</Location>
HERE

65
root/usr/share/smanager/lib/SrvMngr/Controller/Backuppc.pm
View File

@@ -18,8 +18,8 @@ use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session ip_number_or_blank);
use Quota;
use esmith::ConfigDB;
use esmith::AccountsDB;
use esmith::ConfigDB::UTF8;
use esmith::AccountsDB::UTF8;
use esmith::util;
use File::Basename;
@@ -28,23 +28,22 @@ use File::Path qw(make_path remove_tree);
use esmith::Backup;
use esmith::BackupHistoryDB;
use esmith::util;
use esmith::lockfile;
use constant DEBUG => $ENV{MOJO_SMANAGER_DEBUG} || 0;
our $cdb = esmith::ConfigDB->open || die "Couldn't open config db";
our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
my $cdb;
my $adb;
sub main {
my $c = shift;
$c->app->log->info($c->log_req);
#my $modul = get_backuppc( $c );
$cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
$adb = esmith::AccountsDB::UTF8->open || die "Couldn't open accounts db";
my $url = "https://".$c->session->{'SystemName'}.".".$c->session->{"DomainName"}."/BackupPC";
#my $url = 'https://sme10.thereadclan.me.uk/BackupPC';
$c->stash(url => $url );
$c->render(template => 'backuppc');
@@ -53,52 +52,24 @@ sub main {
sub get_backuppc {
my ($c) = @_;
my $tx = $c->tx;
my $req = $tx->req;
# 3 env variables for durep.cgi
#$ENV{'SCRIPT_NAME'} = 'durep';
#$ENV{'REQUEST_METHOD'} = $req->method;
#$ENV{'QUERY_STRING'} = $req->url->query->to_string;
my $res = `https:////sme10.thereadclan.me.uk//BackupPC`;
my ($c) = @_;
my $tx = $c->tx;
my $req = $tx->req;
my $res = `/usr/share/BackupPC/sbin/BackupPC_Admin`; #
my $step = 0; my $out;
my $step = 0;
my $out;
my @lines = split /\n/, $res;
# remove except 'body'
foreach my $line (@lines) {
if ( $line =~ m|<body>| ) {
$step = 1;
} elsif ( $line =~ m|</body>| ) {
$step = 2;
} elsif ( $step == 1 ) {
$out .= $line;
if ( $line =~ m|<body>| ) {
$step = 1;
} elsif ( $line =~ m|</body>| ) {
$step = 2;
} elsif ( $step == 1 ) {
$out .= $line;
}
}
}
return $out;
}
#sub main {
# my $c = shift;
# $c->app->log->info($c->log_req);
# BEGIN
# {
# $ENV {'PATH'} = '/bin:/usr/bin:/sbin';
# $ENV {'SHELL'} = '/bin/bash';
# delete $ENV {'ENV'};
# }
#$c = $c->redirect_to("https://".$ENV {'HTTP_X_FORWARDED_HOST'}."/BackupPC");
# $c = $c->redirect_to("https://sme10.thereadclan.me.uk//BackupPC");
#}
1;

8
smeserver-BackupPC.spec
View File

@@ -4,7 +4,7 @@
Name: smeserver-BackupPC
Version: 0.2
Release: 19%{?dist}
Release: 21%{?dist}
Summary: BackupPC integration into SME server
Group: Applications/System
@@ -52,6 +52,12 @@ This package contains specific configuration for SME server
#----------------------------------------------------
%changelog
* Sun Oct 05 2025 Brian Read <brianr@koozali.org> 0.2-21.sme
- Add UTF8 and avoid potential DB caching problems [SME: 13209]
* Wed Sep 24 2025 Jean-Philippe Pialasse <jpp@koozali.org> 0.2-20.sme
- relaxed CSP
* Tue Sep 23 2025 Jean-Philippe Pialasse <jpp@koozali.org> 0.2-19.sme
- fix /run/BackupPC instead of /var prevents service start
- fix smanager2 display