Add feature to view admin_audit log files

Add a LogFileProvider class that identifies the available log files It checks if the admin_audit app is enabled, and fetches it's logfile path. Additionally, add ability for user to select the file they want to view. The "Download logs" button now downloads the currently selected log file. Tested by enabling and disabling the admin_audit app TODO: Update the commands to also use the chosen logfile Fixes: #318 Signed-off-by: Abijeet <[email protected]>
nextcloud · Mar 28, 2021 · bc87408 · bc87408
1 parent 0ab708a
commit bc87408
Show file tree

Hide file tree

Showing 15 changed files with 307 additions and 53 deletions.
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -14,9 +14,11 @@
 	['name' => 'log#get', 'url' => '/get', 'verb' => 'GET'],
 	['name' => 'log#poll', 'url' => '/poll', 'verb' => 'GET'],
 	['name' => 'log#search', 'url' => '/search', 'verb' => 'GET'],
+	['name' => 'log#download', 'url' => '/download', 'verb' => 'GET'],
 	['name' => 'log#getSettings', 'url' => '/settings', 'verb' => 'GET'],
 	['name' => 'log#getLevels', 'url' => '/levels', 'verb' => 'GET'],
 	['name' => 'log#setLevels', 'url' => '/levels', 'verb' => 'PUT'],
 	['name' => 'log#setRelative', 'url' => '/relative', 'verb' => 'PUT'],
 	['name' => 'log#setLive', 'url' => '/live', 'verb' => 'PUT'],
+	['name' => 'log#setLogFile', 'url' => '/logFile', 'verb' => 'PUT']
 ]];
diff --git a/build/main.css b/build/main.css
diff --git a/build/main.css.map b/build/main.css.map
diff --git a/build/main.js b/build/main.js
diff --git a/build/main.js.map b/build/main.js.map
diff --git a/js/App.js b/js/App.js
@@ -23,7 +23,8 @@ export class App extends Component {
 		provider: null,
 		relative: true,
 		dateFormat: 'Y-m-d\TH:i:sO',
-		live: false
+		live: false,
+		availableLogFiles: []
 	};
 
 	constructor (props) {
@@ -43,11 +44,15 @@ export class App extends Component {
 		const relative = await this.logProvider.getRelative();
 		const dateFormat = await this.logProvider.getDateFormat();
 		const live = await this.logProvider.getLive();
+		const availableLogFiles = await this.logProvider.getAvailableLogFiles();
+		const logFile = await this.logProvider.getLogFile();
 		this.setState({
 			levels,
 			relative,
 			dateFormat,
 			live,
+			availableLogFiles,
+			logFile,
 			provider: this.logProvider
 		});
 		await this.logProvider.load();
@@ -76,7 +81,7 @@ export class App extends Component {
 		this.logProvider.load();
 	}
 
-	onLogFile = async (content) => {
+	onCustomLogFile = async (content) => {
 		const logFile = new LogFile(content);
 		logFile.on('entries', entries => {
 			if (this.state.provider === logFile) {
@@ -107,14 +112,22 @@ export class App extends Component {
 		this.saveLive(live);
 	};
 
+	async setLogFile (logFile)  {
+		this.setState({logFile, loading: true});
+		await this.logProvider.setLogFile(logFile);
+		this.logProvider.reset();
+		this.logProvider.load();
+		this.setState({loading: false});
+	}
+
 	handlePaste = (event) => {
 		let data = event.clipboardData.getData('Text');
 		if (!data) {
 			data = event.clipboardData.getData('text/plain');
 		}
 		data = data.trim();
 		if (data.indexOf('{') !== -1 && data.indexOf('}')) {
-			this.onLogFile(data);
+			this.onCustomLogFile(data);
 		}
 	};
 
@@ -151,6 +164,7 @@ export class App extends Component {
 				isLoading={this.state.loading}>
 				<div className={styles.content}>
 					<LogTable
+						availableLogFiles={this.state.availableLogFiles}
 						inlineSettings={this.props.inlineSettings}
 						levels={this.state.levels}
 						setRelative={this.setRelative}
@@ -161,7 +175,9 @@ export class App extends Component {
 						hidden={this.state.entries.length - entries.length}
 						live={this.state.live}
 						setLive={this.setLive.bind(this)}
-						onLogFile={this.onLogFile}
+						logFile={this.state.logFile}
+						setLogFile={this.setLogFile.bind(this)}
+						onCustomLogFile={this.onCustomLogFile}
 					/>
 				</div>
 			</ReactScrolla>
@@ -172,7 +188,7 @@ export class App extends Component {
 			<div>
 				{!this.props.inlineSettings ?
 					<SideBar><LogUploader
-						onLogFile={this.onLogFile}/>
+						onCustomLogFile={this.onCustomLogFile}/>
 						<Separator/>
 						{filters}
 						<Settings>

diff --git a/js/Components/LogTable.js b/js/Components/LogTable.js
@@ -154,11 +154,15 @@ export class LogTable extends Component {
 								{
 									this.state.showLevelSettings ?
 										<Settings
+											availableLogFiles={this.props.availableLogFiles}
 											setLevel={this.props.setLevel}
 											levels={this.props.levels}
 											live={this.props.live}
 											setLive={this.props.setLive}
-											onLogFile={this.props.onLogFile}
+											live={this.props.live}
+											setLogFile={this.props.setLogFile}
+											logFile={this.props.logFile}
+											onCustomLogFile={this.props.onCustomLogFile}
 										/> :
 										<div className="hidden"/>
 								}

diff --git a/js/Components/LogUploader.js b/js/Components/LogUploader.js
@@ -21,7 +21,7 @@ export class LogUploader extends Component {
 				this.setState({message: 'Invalid log file'});
 				return;
 			}
-			this.props.onLogFile(content);
+			this.props.onCustomLogFile(content);
 		};
 		reader.readAsText(file);
 	};