From 734c493dc1e416ee188ad121033b7856e8259816 Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Thu, 18 Jan 2018 17:54:13 +0100
Subject: [statistics] added permissions to view client logs; removed unused
 query arguments from Paginate::exec (caused an error if query arguments that
 are actually used in the query are passed to Paginate::exec)

---
 modules-available/syslog/lang/de/permissions.json | 3 +++
 modules-available/syslog/lang/en/permissions.json | 3 +++
 2 files changed, 6 insertions(+)
 create mode 100644 modules-available/syslog/lang/de/permissions.json
 create mode 100644 modules-available/syslog/lang/en/permissions.json

(limited to 'modules-available/syslog/lang')

diff --git a/modules-available/syslog/lang/de/permissions.json b/modules-available/syslog/lang/de/permissions.json
new file mode 100644
index 00000000..0cd05451
--- /dev/null
+++ b/modules-available/syslog/lang/de/permissions.json
@@ -0,0 +1,3 @@
+{
+	"view": "Client Log anschauen."
+}
\ No newline at end of file
diff --git a/modules-available/syslog/lang/en/permissions.json b/modules-available/syslog/lang/en/permissions.json
new file mode 100644
index 00000000..497e199e
--- /dev/null
+++ b/modules-available/syslog/lang/en/permissions.json
@@ -0,0 +1,3 @@
+{
+	"view": "View client log."
+}
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From fe1f5f76a5b5553cf92176488858f2bbd760463b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 8 Feb 2018 12:19:12 +0100
Subject: Update translations

---
 modules-available/statistics_reporting/lang/de/template-tags.json | 1 +
 modules-available/statistics_reporting/lang/en/template-tags.json | 1 +
 modules-available/syslog/lang/de/messages.json                    | 4 ++++
 modules-available/syslog/lang/de/template-tags.json               | 7 ++++---
 modules-available/syslog/lang/en/messages.json                    | 4 ++++
 modules-available/syslog/lang/en/template-tags.json               | 7 ++++---
 6 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 modules-available/syslog/lang/de/messages.json
 create mode 100644 modules-available/syslog/lang/en/messages.json

(limited to 'modules-available/syslog/lang')

diff --git a/modules-available/statistics_reporting/lang/de/template-tags.json b/modules-available/statistics_reporting/lang/de/template-tags.json
index 3b8c24f1..34c4b80b 100644
--- a/modules-available/statistics_reporting/lang/de/template-tags.json
+++ b/modules-available/statistics_reporting/lang/de/template-tags.json
@@ -14,6 +14,7 @@
     "lang_reportingDescription": "Helfen Sie uns bwLehrpool durch das w\u00f6chentliche Verschicken eines anonymisierten Statistikberichts zu verbessern. Wenn Sie den Inhalt eines solchen Reports genauer inspizieren wollen, k\u00f6nnen Sie \u00fcber den untenstehenden Button einen aktuellen Report Ihres Servers herunterladen.",
     "lang_reportingLabel": "Anonymisierte Nutzungsstatistiken \u00fcbermitteln",
     "lang_sessions": "Sitzungen",
+    "lang_settings": "Einstellungen",
     "lang_shortSessions": "Sitzungen < 60s",
     "lang_show": "Anzeigen",
     "lang_total": "Gesamt",
diff --git a/modules-available/statistics_reporting/lang/en/template-tags.json b/modules-available/statistics_reporting/lang/en/template-tags.json
index d5f9948d..7ddc3973 100644
--- a/modules-available/statistics_reporting/lang/en/template-tags.json
+++ b/modules-available/statistics_reporting/lang/en/template-tags.json
@@ -14,6 +14,7 @@
     "lang_reportingDescription": "Help us improve bwLehrpool by automatically sending an anonymized statistics report once a week. If you want to check what data the report contains, you can download such a report for reference below.",
     "lang_reportingLabel": "Send anonymized usage statistics",
     "lang_sessions": "Sessions",
+    "lang_settings": "Settings",
     "lang_shortSessions": "Sessions < 60s",
     "lang_show": "Show",
     "lang_total": "Total",
diff --git a/modules-available/syslog/lang/de/messages.json b/modules-available/syslog/lang/de/messages.json
new file mode 100644
index 00000000..eec31c2f
--- /dev/null
+++ b/modules-available/syslog/lang/de/messages.json
@@ -0,0 +1,4 @@
+{
+    "anon-days-out-of-range": "Tage muss zwischen 0 und 180 liegen (war {{0}})",
+    "anon-days-saved": "Anonymisierungszeitraum gespeichert"
+}
\ No newline at end of file
diff --git a/modules-available/syslog/lang/de/template-tags.json b/modules-available/syslog/lang/de/template-tags.json
index c8b2bb45..b5c6f8c7 100644
--- a/modules-available/syslog/lang/de/template-tags.json
+++ b/modules-available/syslog/lang/de/template-tags.json
@@ -1,11 +1,12 @@
 {
+    "lang_anonDaysDescription": "Nach wie vielen Tagen sollen Logeintr\u00e4ge anonymisiert werden? Auf 0 setzen, um Funktion zu deaktivieren.",
+    "lang_applyFilter": "Filter anwenden",
     "lang_client": "Client",
     "lang_clientLog": "Client Log",
     "lang_details": "Details",
     "lang_event": "Ereignis",
     "lang_filter": "Filter",
-    "lang_go": "Go",
     "lang_not": "not",
-    "lang_when": "Wann",
-    "lang_applyFilter": "Filter anwenden"
+    "lang_settings": "Einstellungen",
+    "lang_when": "Wann"
 }
\ No newline at end of file
diff --git a/modules-available/syslog/lang/en/messages.json b/modules-available/syslog/lang/en/messages.json
new file mode 100644
index 00000000..5578d7b9
--- /dev/null
+++ b/modules-available/syslog/lang/en/messages.json
@@ -0,0 +1,4 @@
+{
+    "anon-days-out-of-range": "Days have to be between 0 and 180 (was {{0}})",
+    "anon-days-saved": "Anonymization delay saved"
+}
\ No newline at end of file
diff --git a/modules-available/syslog/lang/en/template-tags.json b/modules-available/syslog/lang/en/template-tags.json
index 7dae52d9..1aae1fe9 100644
--- a/modules-available/syslog/lang/en/template-tags.json
+++ b/modules-available/syslog/lang/en/template-tags.json
@@ -1,11 +1,12 @@
 {
+    "lang_anonDaysDescription": "After how many days should log messages be anonymized? Set to 0 to disable this feature.",
+    "lang_applyFilter": "Apply Filter",
     "lang_client": "Client",
     "lang_clientLog": "Client Log",
     "lang_details": "Details",
     "lang_event": "Event",
     "lang_filter": "Filter",
-    "lang_go": "Go",
     "lang_not": "not",
-    "lang_when": "When",
-    "lang_applyFilter": "Apply Filter"
+    "lang_settings": "Settings",
+    "lang_when": "When"
 }
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From 2a8858e17ef441a22526e8aedf5262e7e065d8d6 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 13 Feb 2018 16:30:49 +0100
Subject: [syslog] Permission checks when saving anonymization days

---
 modules-available/syslog/lang/de/permissions.json  |  3 +-
 modules-available/syslog/lang/en/permissions.json  |  3 +-
 modules-available/syslog/page.inc.php              |  7 +++--
 .../syslog/permissions/permissions.json            |  3 ++
 modules-available/syslog/templates/heading.html    | 36 +++++++++++++++++++++-
 .../syslog/templates/page-syslog.html              | 26 ----------------
 6 files changed, 47 insertions(+), 31 deletions(-)

(limited to 'modules-available/syslog/lang')

diff --git a/modules-available/syslog/lang/de/permissions.json b/modules-available/syslog/lang/de/permissions.json
index 0cd05451..dcd96ae1 100644
--- a/modules-available/syslog/lang/de/permissions.json
+++ b/modules-available/syslog/lang/de/permissions.json
@@ -1,3 +1,4 @@
 {
-	"view": "Client Log anschauen."
+    "configure-anonymization": "Einstellen, nach wie vielen Tagen die Nutzernamen in den Logs entfernt werden.",
+    "view": "Client Log anschauen."
 }
\ No newline at end of file
diff --git a/modules-available/syslog/lang/en/permissions.json b/modules-available/syslog/lang/en/permissions.json
index 497e199e..26ea4448 100644
--- a/modules-available/syslog/lang/en/permissions.json
+++ b/modules-available/syslog/lang/en/permissions.json
@@ -1,3 +1,4 @@
 {
-	"view": "View client log."
+    "configure-anonymization": "Configure after how many days any usernames will be removed from log files.",
+    "view": "View client log."
 }
\ No newline at end of file
diff --git a/modules-available/syslog/page.inc.php b/modules-available/syslog/page.inc.php
index a26ed9be..3a7513b5 100644
--- a/modules-available/syslog/page.inc.php
+++ b/modules-available/syslog/page.inc.php
@@ -14,7 +14,9 @@ class Page_SysLog extends Page
 			Message::addError('main.no-permission');
 			Util::redirect('?do=Main');
 		}
+
 		if (($days = Request::post('anondays', false, 'int')) !== false) {
+			User::assertPermission('configure-anonymization', NULL,'?do=syslog');
 			if ($days < 0 || $days > 180) {
 				Message::addError('anon-days-out-of-range', $days);
 			} else {
@@ -27,7 +29,9 @@ class Page_SysLog extends Page
 
 	protected function doRender()
 	{
-		Render::addTemplate("heading");
+		$data = ['anondays' => Property::get(self::PROP_ANON_DAYS, 0)];
+		Permission::addGlobalTags($data['perms'], NULL, ['configure-anonymization']);
+		Render::addTemplate("heading", $data);
 
 		if (!User::hasPermission("view")) {
 			Message::addError('main.no-permission');
@@ -104,7 +108,6 @@ class Page_SysLog extends Page
 			'list'     => $lines,
 			'types'    => json_encode(array_values($types)),
 			'machineuuid' => Request::get('machineuuid'),
-			'anondays' => Property::get(self::PROP_ANON_DAYS, 0),
 		));
 	}
 
diff --git a/modules-available/syslog/permissions/permissions.json b/modules-available/syslog/permissions/permissions.json
index fcf530c5..cabf82f9 100644
--- a/modules-available/syslog/permissions/permissions.json
+++ b/modules-available/syslog/permissions/permissions.json
@@ -1,5 +1,8 @@
 {
     "view": {
         "location-aware": true
+    },
+    "configure-anonymization": {
+        "location-aware": false
     }
 }
\ No newline at end of file
diff --git a/modules-available/syslog/templates/heading.html b/modules-available/syslog/templates/heading.html
index d6790a21..2ab1a848 100644
--- a/modules-available/syslog/templates/heading.html
+++ b/modules-available/syslog/templates/heading.html
@@ -1 +1,35 @@
-<h1>{{lang_clientLog}}</h1>
\ No newline at end of file
+<div class="page-header">
+	<button type="button" class="btn btn-default pull-right" data-toggle="modal" data-target="#modal-settings">
+		<span class="glyphicon glyphicon-cog"></span> {{lang_settings}}
+	</button>
+
+	<div id="modal-settings" class="modal fade" role="dialog">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<form method="post" action="?do=syslog">
+					<input type="hidden" name="token" value="{{token}}">
+					<div class="modal-header">
+						<button type="button" class="close" data-dismiss="modal">&times;</button>
+						<h4 class="modal-title"><b>{{lang_settings}}</b></h4>
+					</div>
+					<div class="modal-body">
+						<p>{{lang_anonDaysDescription}}</p>
+						<input {{perms.configure-anonymization.disabled}} class="form-control" type="number" name="anondays"
+								value="{{anondays}}" min="0" max="180">
+					</div>
+					<div class="modal-footer">
+						<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
+						<button {{perms.configure-anonymization.disabled}} type="submit"
+								class="btn btn-primary">
+							<span class="glyphicon glyphicon-floppy-disk"></span>
+							{{lang_save}}
+						</button>
+					</div>
+				</form>
+			</div>
+
+		</div>
+	</div>
+
+	<h1>{{lang_clientLog}}</h1>
+</div>
\ No newline at end of file
diff --git a/modules-available/syslog/templates/page-syslog.html b/modules-available/syslog/templates/page-syslog.html
index 7ab81067..9d05d434 100644
--- a/modules-available/syslog/templates/page-syslog.html
+++ b/modules-available/syslog/templates/page-syslog.html
@@ -1,6 +1,3 @@
-<button type="button" class="btn btn-default pull-right" data-toggle="modal" data-target="#modal-settings">
-	<span class="glyphicon glyphicon-cog"></span> {{lang_settings}}
-</button>
 <style type="text/css">
 	.selectize-dropdown {
 		max-width: 500px;
@@ -76,29 +73,6 @@
 	</div>
 </div>
 
-<div id="modal-settings" class="modal fade" role="dialog">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<form method="post" action="?do=syslog">
-				<input type="hidden" name="token" value="{{token}}">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal">&times;</button>
-					<h4 class="modal-title"><b>{{lang_settings}}</b></h4>
-				</div>
-				<div class="modal-body">
-					<p>{{lang_anonDaysDescription}}</p>
-					<input type="number" name="anondays" value="{{anondays}}" min="0" max="180">
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
-					<button type="submit" class="btn btn-primary">{{lang_save}}</button>
-				</div>
-			</form>
-		</div>
-
-	</div>
-</div>
-
 <script type="application/javascript"><!--
 document.addEventListener('DOMContentLoaded', function () {
 
-- 
cgit v1.2.3-55-g7522


From f37c95a560f0d2bac96e4b0e650d12691181b876 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 7 Aug 2018 16:48:13 +0200
Subject: [syslog] Add user export feature

This will export all rows from tables that log user related content,
data, events, helping administrators to conform to DSGVO information requests.

Closes #3401
---
 modules-available/syslog/api.inc.php               | 39 ++++++++++++++++++++++
 .../syslog/lang/de/template-tags.json              |  4 +++
 .../syslog/lang/en/template-tags.json              |  4 +++
 modules-available/syslog/page.inc.php              |  2 +-
 .../syslog/permissions/permissions.json            |  3 ++
 modules-available/syslog/templates/heading.html    | 39 ++++++++++++++++++++--
 6 files changed, 87 insertions(+), 4 deletions(-)

(limited to 'modules-available/syslog/lang')

diff --git a/modules-available/syslog/api.inc.php b/modules-available/syslog/api.inc.php
index 18c42c31..945f9d09 100644
--- a/modules-available/syslog/api.inc.php
+++ b/modules-available/syslog/api.inc.php
@@ -1,5 +1,44 @@
 <?php
 
+// Check for user data export
+if (($user = Request::post('export-user', false, 'string')) !== false) {
+	User::load();
+	User::assertPermission('export-user-data', null, '?do=syslog');
+	if (!Util::verifyToken()) {
+		die('Invalid Token');
+	}
+	$puser = preg_quote($user);
+	$exp = "$puser logged|^\[$puser\]";
+	Header('Content-Type: text/plain; charset=utf-8');
+	Header('Content-Disposition: attachment; filename=bwlehrpool-export-' .Util::sanitizeFilename($user) . '-' . date('Y-m-d') . '.txt');
+	$srcs = [];
+	$srcs[] = ['res' => Database::simpleQuery("SELECT dateline, logtypeid AS typeid, clientip, description FROM clientlog
+		WHERE description REGEXP :exp
+		ORDER BY dateline ASC", ['exp' => $exp])];
+	if (Module::get('statistics') !== false) {
+		$srcs[] = ['res' => Database::simpleQuery("SELECT dateline, typeid, clientip, data AS description FROM statistic
+			WHERE username = :user
+			ORDER BY dateline ASC", ['user' => $user])];
+	}
+	echo "# Begin log\n";
+	for (;;) {
+		unset($best);
+		foreach ($srcs as &$src) {
+			if (!isset($src['row'])) {
+				$src['row'] = $src['res']->fetch(PDO::FETCH_ASSOC);
+			}
+			if ($src['row'] !== false && (!isset($best) || $src['row']['dateline'] < $best['dateline'])) {
+				$best =& $src['row'];
+			}
+		}
+		if (!isset($best))
+			break;
+		echo date('Y-m-d H:i:s', $best['dateline']), "\t", $best['typeid'], "\t", $best['clientip'], "\t", $best['description'], "\n";
+		$best = null; // so we repopulate on next iteration
+	}
+	die("# End log\n");
+}
+
 if (empty($_POST['type'])) die('Missing options.');
 $type = mb_strtolower($_POST['type']);
 
diff --git a/modules-available/syslog/lang/de/template-tags.json b/modules-available/syslog/lang/de/template-tags.json
index b5c6f8c7..c00d619a 100644
--- a/modules-available/syslog/lang/de/template-tags.json
+++ b/modules-available/syslog/lang/de/template-tags.json
@@ -5,8 +5,12 @@
     "lang_clientLog": "Client Log",
     "lang_details": "Details",
     "lang_event": "Ereignis",
+    "lang_export": "Exportieren",
+    "lang_exportUserDesc": "Mit dieser Funktion k\u00f6nnen Sie alle in der Datenbank vorhandenen Datens\u00e4tze zu einem bestimmten Benutzer exportieren. Bitte geben Sie den Benutzernamen genau so ein, wie ihn der Nutzer beim Login am Client angeben muss.",
     "lang_filter": "Filter",
     "lang_not": "not",
     "lang_settings": "Einstellungen",
+    "lang_userExport": "Nutzer-Export",
+    "lang_userLogin": "Benutzer-Login",
     "lang_when": "Wann"
 }
\ No newline at end of file
diff --git a/modules-available/syslog/lang/en/template-tags.json b/modules-available/syslog/lang/en/template-tags.json
index 1aae1fe9..24e9aaa1 100644
--- a/modules-available/syslog/lang/en/template-tags.json
+++ b/modules-available/syslog/lang/en/template-tags.json
@@ -5,8 +5,12 @@
     "lang_clientLog": "Client Log",
     "lang_details": "Details",
     "lang_event": "Event",
+    "lang_export": "Export",
+    "lang_exportUserDesc": "This exports all data from the database relating to the given user login. Please specify the user name exactly the way they would provide it when logging in on a client.",
     "lang_filter": "Filter",
     "lang_not": "not",
     "lang_settings": "Settings",
+    "lang_userExport": "User export",
+    "lang_userLogin": "User login",
     "lang_when": "When"
 }
\ No newline at end of file
diff --git a/modules-available/syslog/page.inc.php b/modules-available/syslog/page.inc.php
index 00c55a3f..6c1a0a16 100644
--- a/modules-available/syslog/page.inc.php
+++ b/modules-available/syslog/page.inc.php
@@ -31,7 +31,7 @@ class Page_SysLog extends Page
 	protected function doRender()
 	{
 		$data = ['anondays' => Property::get(self::PROP_ANON_DAYS, 0)];
-		Permission::addGlobalTags($data['perms'], NULL, ['configure-anonymization']);
+		Permission::addGlobalTags($data['perms'], NULL, ['configure-anonymization', 'export-user-data']);
 		Render::addTemplate("heading", $data);
 
 		if (!User::hasPermission("view")) {
diff --git a/modules-available/syslog/permissions/permissions.json b/modules-available/syslog/permissions/permissions.json
index cabf82f9..1f2373d4 100644
--- a/modules-available/syslog/permissions/permissions.json
+++ b/modules-available/syslog/permissions/permissions.json
@@ -4,5 +4,8 @@
     },
     "configure-anonymization": {
         "location-aware": false
+    },
+    "export-user-data": {
+        "location-aware": false
     }
 }
\ No newline at end of file
diff --git a/modules-available/syslog/templates/heading.html b/modules-available/syslog/templates/heading.html
index 2ab1a848..8dd3d440 100644
--- a/modules-available/syslog/templates/heading.html
+++ b/modules-available/syslog/templates/heading.html
@@ -1,7 +1,13 @@
 <div class="page-header">
-	<button type="button" class="btn btn-default pull-right" data-toggle="modal" data-target="#modal-settings">
-		<span class="glyphicon glyphicon-cog"></span> {{lang_settings}}
-	</button>
+	<span class="buttonbar pull-right">
+		<button type="button" class="btn btn-default" data-toggle="modal" data-target="#modal-export" {{perms.export-user-data.disabled}}>
+			<span class="glyphicon glyphicon-export"></span>
+			{{lang_userExport}}
+		</button>
+		<button type="button" class="btn btn-default" data-toggle="modal" data-target="#modal-settings">
+			<span class="glyphicon glyphicon-cog"></span> {{lang_settings}}
+		</button>
+	</span>
 
 	<div id="modal-settings" class="modal fade" role="dialog">
 		<div class="modal-dialog">
@@ -31,5 +37,32 @@
 		</div>
 	</div>
 
+	<div id="modal-export" class="modal fade" role="dialog">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<form method="post" action="api.php?do=syslog">
+					<input type="hidden" name="token" value="{{token}}">
+					<div class="modal-header">
+						<button type="button" class="close" data-dismiss="modal">&times;</button>
+						<h4 class="modal-title"><b>{{lang_userExport}}</b></h4>
+					</div>
+					<div class="modal-body">
+						<p>{{lang_exportUserDesc}}</p>
+						<label for="export-user-name">{{lang_userLogin}}</label>
+						<input id="export-user-name" type="text" name="export-user" class="form-control" style="width:100%">
+					</div>
+					<div class="modal-footer">
+						<button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button>
+						<button type="submit" class="btn btn-primary">
+							<span class="glyphicon glyphicon-export"></span>
+							{{lang_export}}
+						</button>
+					</div>
+				</form>
+			</div>
+
+		</div>
+	</div>
+
 	<h1>{{lang_clientLog}}</h1>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522