diff options
| author | Bruno Ribas <brunoribas@gmail.com> | 2022-05-20 15:55:25 +0000 |
|---|---|---|
| committer | Bruno Ribas <brunoribas@gmail.com> | 2022-05-20 15:55:25 +0000 |
| commit | 64e2fe6288449071d85a68f6a9a28f3ef359034b (patch) | |
| tree | 7034ef5cb7ec02be4436114035c7019af77ecf80 | |
| parent | b7ad2f72ea70125754b6a44820cbdec334993aea (diff) | |
| download | boca-64e2fe6288449071d85a68f6a9a28f3ef359034b.tar.gz boca-64e2fe6288449071d85a68f6a9a28f3ef359034b.zip | |
fast forward old changes
Signed-off-by: Bruno Ribas <brunoribas@gmail.com>
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | src/filedownload.php | 1 | ||||
| -rw-r--r-- | src/filewindow.php | 1 | ||||
| -rw-r--r-- | src/flog.php | 22 | ||||
| -rwxr-xr-x | tools/boca-createjail | 2 |
6 files changed, 27 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog index 85ed23f..0268731 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +boca (1.5.14-8ubuntu4.2) focal; urgency=medium + + * unglysalt workaround. + + -- Bruno Cesar Ribas <bruno.ribas@unb.br> Fri, 30 Jul 2021 11:18:05 -0300 + +boca (1.5.14-8ubuntu4.1) focal; urgency=medium + + * Updates from BR regional + + -- Bruno Cesar Ribas <bruno.ribas@unb.br> Fri, 18 Dec 2020 14:43:45 -0300 + boca (1.5.14-8ubuntu4) focal; urgency=medium * Compatible with Ubuntu focal diff --git a/debian/control b/debian/control index c0dbd6a..62135f4 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: boca Section: misc Priority: optional Maintainer: BOCA Development Team <bocasystem@gmail.com> -Uploaders: Cassio Polpo de Campos <cassiopc@gmail.com>, Bruno Cesar Ribas <brunoribas@gmail.com> +Uploaders: Cassio Polpo de Campos <cassiopc@gmail.com>, Bruno Cesar Ribas <bruno.ribas@unb.br> Build-Depends: debhelper, build-essential Package: boca diff --git a/src/filedownload.php b/src/filedownload.php index df45beb..bc2ebf1 100644 --- a/src/filedownload.php +++ b/src/filedownload.php @@ -34,6 +34,7 @@ if(!isset($_GET["oid"]) || !is_numeric($_GET["oid"]) || !isset($_GET["filename"] } $cf = globalconf(); +$uglysalt="30a2224c82dcf42e497e2a1f6bd6516b"; $fname = decryptData(myrawurldecode($_GET["filename"]), $uglysalt . $cf["key"]); if(isset($_GET["msg"])) diff --git a/src/filewindow.php b/src/filewindow.php index e685792..b858bbb 100644 --- a/src/filewindow.php +++ b/src/filewindow.php @@ -36,6 +36,7 @@ if(!isset($_GET["oid"]) || !is_numeric($_GET["oid"]) || !isset($_GET["filename"] } $cf = globalconf(); +$uglysalt="30a2224c82dcf42e497e2a1f6bd6516b"; $fname = decryptData(myrawurldecode($_GET["filename"]), $uglysalt . $cf["key"]); $msg = ''; if(isset($_GET["msg"])) diff --git a/src/flog.php b/src/flog.php index 9ff6357..b8f4122 100644 --- a/src/flog.php +++ b/src/flog.php @@ -177,23 +177,23 @@ function DBLogInContest($name,$pass,$contest,$msg=true) { unset($_SESSION["usertable"]); return false; } - if($prevuser != $ccode && $a["usertype"] == "team") { - LOGLevel("User $name tried to log in contest $contest but computer is invalid ($ccode).",2); - if($msg) MSGError("Invalid computer (3)."); - unset($_SESSION["usertable"]); - return false; - } + //if($prevuser != $ccode && $a["usertype"] == "team") { + // LOGLevel("User $name tried to log in contest $contest but computer is invalid ($ccode).",2); + // if($msg) MSGError("Invalid computer (3)."); + // unset($_SESSION["usertable"]); + // return false; + //} } else { if($a["usertype"] == "team") @file_put_contents($dircode, $ccode); } $gip=getIP(); - if(!ValidCookie(true,$gip)) { - if($msg) MSGError("Invalid computer (4)."); - unset($_SESSION["usertable"]); - return false; - } + //if(!ValidCookie(true,$gip)) { + // if($msg) MSGError("Invalid computer (4)."); + // unset($_SESSION["usertable"]); + // return false; + //} if ($a["userip"] != $gip && $a["userip"] != "" && $a["usertype"] != "score") { LOGLevel("User $name is using two different IPs: " . $a["userip"] . diff --git a/tools/boca-createjail b/tools/boca-createjail index 1340282..4a22565 100755 --- a/tools/boca-createjail +++ b/tools/boca-createjail @@ -118,7 +118,7 @@ echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen /usr/sbin/update-locale apt-get -y update apt-get -y install software-properties-common -add-apt-repository -y ppa:icpc-latam/maratona-linux +add-apt-repository -y ppa:icpc-latam/unstable apt-get -y update apt-get -y upgrade apt-get -y install maratona-linguagens --no-install-recommends --allow-unauthenticated |