From 042cd78894b7c9ce622715e86cb52e203dbe4b34 Mon Sep 17 00:00:00 2001
From: therealbobo
Date: Sun, 13 Sep 2020 00:51:55 +0200
Subject: added config menu

---
 frontend/src/views/Header.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'frontend/src/views/Header.js')

diff --git a/frontend/src/views/Header.js b/frontend/src/views/Header.js
index 5d0f690..03e4e5c 100644
--- a/frontend/src/views/Header.js
+++ b/frontend/src/views/Header.js
@@ -72,9 +72,8 @@ class Header extends Component {
                             <Button onClick={this.props.onOpenFilters}>filters</Button>
                             <Button variant="yellow" size="sm">pcaps</Button>
                             <Button variant="blue" onClick={this.props.onOpenRules}>rules</Button>
-                            <Button variant="red" onClick={this.props.onOpenServices}>
-                                services
-                            </Button>
+                            <Button variant="red" onClick={this.props.onOpenServices}>services</Button>
+                            <Button variant="green" onClick={this.props.onOpenConfig}>config</Button>
                         </div>
                     </div>
                 </div>
-- 
cgit v1.2.3-70-g09d2


From e1ce4fefede7f956e4b7ae9bc602b4f49fbfad69 Mon Sep 17 00:00:00 2001
From: therealbobo
Date: Mon, 14 Sep 2020 11:32:57 +0200
Subject: auto disabling config button

---
 frontend/src/views/App.js      |  9 +++++++--
 frontend/src/views/Config.js   |  4 ++++
 frontend/src/views/Config.scss | 13 +++++++++++++
 frontend/src/views/Header.js   |  3 ++-
 4 files changed, 26 insertions(+), 3 deletions(-)

(limited to 'frontend/src/views/Header.js')

diff --git a/frontend/src/views/App.js b/frontend/src/views/App.js
index 5b49045..5a2d913 100644
--- a/frontend/src/views/App.js
+++ b/frontend/src/views/App.js
@@ -16,13 +16,16 @@ class App extends Component {
             servicesWindowOpen: false,
             filterWindowOpen: false,
             rulesWindowOpen: false,
-            configWindowOpen: false
+            configWindowOpen: false,
+            configDone: false
         };
 
 		fetch('/api/services')
 		.then(response => {
 			if( response.status === 503){
 				this.setState({configWindowOpen: true});
+			} else if (response.status === 200){
+				this.setState({configDone: true});
 			}
 		});
 
@@ -41,7 +44,8 @@ class App extends Component {
             modal = <Rules onHide={() => this.setState({rulesWindowOpen: false})}/>;
         }
         if (this.state.configWindowOpen) {
-            modal = <Config onHide={() => this.setState({configWindowOpen: false})}/>;
+            modal = <Config onHide={() => this.setState({configWindowOpen: false})}
+						onDone={() => this.setState({configDone: true})}/>;
         }
 
         return (
@@ -51,6 +55,7 @@ class App extends Component {
                             onOpenFilters={() => this.setState({filterWindowOpen: true})}
                             onOpenRules={() => this.setState({rulesWindowOpen: true})} 
                             onOpenConfig={() => this.setState({configWindowOpen: true})} 
+							onConfigDone={this.state.configDone}
 					/>
                     <Switch>
                         <Route path="/connections/:id" children={<MainPane/>}/>
diff --git a/frontend/src/views/Config.js b/frontend/src/views/Config.js
index 9b220d9..1468b1b 100644
--- a/frontend/src/views/Config.js
+++ b/frontend/src/views/Config.js
@@ -77,6 +77,8 @@ class Config extends Component {
 				if (response.status === 202 ){
 					//this.setState({showConfig:false});
 					this.props.onHide();
+					this.props.onDone();
+					console.log(this.props.disabled);
 				}
 			}
 		);
@@ -158,6 +160,8 @@ class Config extends Component {
                     </Modal.Title>
                 </Modal.Header>
                 <Modal.Body>
+					<div class="blink"><span><b>Warning:</b></span> once the configuration is completed, it cannot be changed unless you reset caronte :(</div> 
+					<hr/>
                     <Container>
                         <Row>
                             <Col md={5}>
diff --git a/frontend/src/views/Config.scss b/frontend/src/views/Config.scss
index 9946ce9..b0b899f 100644
--- a/frontend/src/views/Config.scss
+++ b/frontend/src/views/Config.scss
@@ -36,3 +36,16 @@
     width: 80px;
   }
 }
+
+.blink{
+
+	span{
+		animation: blink 1s linear infinite;
+	}
+	@keyframes blink{
+		0%{opacity: 0;}
+		50%{opacity: .5;}
+		100%{opacity: 1;}
+	}
+
+}
diff --git a/frontend/src/views/Header.js b/frontend/src/views/Header.js
index 03e4e5c..3f95bcd 100644
--- a/frontend/src/views/Header.js
+++ b/frontend/src/views/Header.js
@@ -73,7 +73,8 @@ class Header extends Component {
                             <Button variant="yellow" size="sm">pcaps</Button>
                             <Button variant="blue" onClick={this.props.onOpenRules}>rules</Button>
                             <Button variant="red" onClick={this.props.onOpenServices}>services</Button>
-                            <Button variant="green" onClick={this.props.onOpenConfig}>config</Button>
+                            <Button variant="green" onClick={this.props.onOpenConfig} 
+								disabled={this.props.onConfigDone}>config</Button>
                         </div>
                     </div>
                 </div>
-- 
cgit v1.2.3-70-g09d2


From 81e22267dfddca85e9e515ce7683efa9c8541ac8 Mon Sep 17 00:00:00 2001
From: therealbobo
Date: Mon, 14 Sep 2020 18:49:09 +0200
Subject: initial upload support

---
 frontend/src/views/App.js      |   6 +++
 frontend/src/views/Header.js   |   2 +-
 frontend/src/views/Upload.js   | 106 +++++++++++++++++++++++++++++++++++++++++
 frontend/src/views/Upload.scss |  21 ++++++++
 4 files changed, 134 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/views/Upload.js
 create mode 100644 frontend/src/views/Upload.scss

(limited to 'frontend/src/views/Header.js')

diff --git a/frontend/src/views/App.js b/frontend/src/views/App.js
index 5a2d913..ebead2f 100644
--- a/frontend/src/views/App.js
+++ b/frontend/src/views/App.js
@@ -7,6 +7,7 @@ import Services from "./Services";
 import Filters from "./Filters";
 import Rules from "./Rules";
 import Config from "./Config";
+import Upload from "./Upload";
 
 class App extends Component {
 
@@ -17,6 +18,7 @@ class App extends Component {
             filterWindowOpen: false,
             rulesWindowOpen: false,
             configWindowOpen: false,
+            uploadWindowOpen: false,
             configDone: false
         };
 
@@ -47,6 +49,9 @@ class App extends Component {
             modal = <Config onHide={() => this.setState({configWindowOpen: false})}
 						onDone={() => this.setState({configDone: true})}/>;
         }
+        if (this.state.uploadWindowOpen) {
+            modal = <Upload onHide={() => this.setState({uploadWindowOpen: false}) }/>;
+        }
 
         return (
             <div className="app">
@@ -55,6 +60,7 @@ class App extends Component {
                             onOpenFilters={() => this.setState({filterWindowOpen: true})}
                             onOpenRules={() => this.setState({rulesWindowOpen: true})} 
                             onOpenConfig={() => this.setState({configWindowOpen: true})} 
+                            onOpenUpload={() => this.setState({uploadWindowOpen: true})} 
 							onConfigDone={this.state.configDone}
 					/>
                     <Switch>
diff --git a/frontend/src/views/Header.js b/frontend/src/views/Header.js
index 3f95bcd..0af7abf 100644
--- a/frontend/src/views/Header.js
+++ b/frontend/src/views/Header.js
@@ -70,7 +70,7 @@ class Header extends Component {
                     <div className="col">
                         <div className="header-buttons">
                             <Button onClick={this.props.onOpenFilters}>filters</Button>
-                            <Button variant="yellow" size="sm">pcaps</Button>
+                            <Button variant="warning" onClick={this.props.onOpenUpload}>pcaps</Button>
                             <Button variant="blue" onClick={this.props.onOpenRules}>rules</Button>
                             <Button variant="red" onClick={this.props.onOpenServices}>services</Button>
                             <Button variant="green" onClick={this.props.onOpenConfig} 
diff --git a/frontend/src/views/Upload.js b/frontend/src/views/Upload.js
new file mode 100644
index 0000000..522afe8
--- /dev/null
+++ b/frontend/src/views/Upload.js
@@ -0,0 +1,106 @@
+import React, {Component} from 'react';
+import './Upload.scss';
+import {Button, ButtonGroup, Col, Container, Form, FormControl, InputGroup, Modal, Row, Table} from "react-bootstrap";
+import bsCustomFileInput from 'bs-custom-file-input'
+import {createCurlCommand} from '../utils';
+
+class Upload extends Component {
+
+    constructor(props) {
+        super(props);
+
+		this.state = {
+		  selectedFile: null,
+			errors: ""
+		};
+
+    }
+
+	onFileChange = event => { 
+      this.setState({ selectedFile: event.target.files[0] }); 
+     
+    }; 
+
+	componentDidMount() {
+		bsCustomFileInput.init()
+	}
+
+    onFileUpload = () => {
+		const formData = new FormData();
+		formData.append( 
+		  "file", 
+		  this.state.selectedFile, 
+		  this.state.selectedFile.name 
+		); 
+		fetch('/api/pcap/upload', {
+			method: 'POST',
+			body: formData
+		})
+			.then(response => {
+				if (response.status === 202 ){
+					//this.setState({showConfig:false});
+					this.props.onHide();
+					//this.props.onDone();
+				} else {
+					response.json().then(data => {
+						this.setState(
+							{errors : data.error.toString()}
+						);
+					});
+				}
+			}
+		);
+    }
+
+
+    render() {
+
+        return (
+            <Modal
+                {...this.props}
+                show="true"
+                size="lg"
+                aria-labelledby="services-dialog"
+                centered
+            >
+                <Modal.Header>
+                    <Modal.Title id="services-dialog">
+                        /usr/bin/upload
+                    </Modal.Title>
+                </Modal.Header>
+                <Modal.Body>
+                    <Container>
+                        <Row>
+							<Form.File
+							type="file"
+							className="custom-file"
+							onChange={this.onFileChange}
+							label=".pcap/.pcapng"
+							id="custom-file"
+							custom
+							/>
+                        </Row>
+                        <Row>
+							<div class="error">
+							<b>
+								<br/>
+								{this.state.errors
+									.split('\n').map((item, key) => {
+									  return <span key={key}>{item}<br/></span>})
+								}
+							</b>
+							</div>
+                        </Row>
+                    </Container>
+                </Modal.Body>
+                <Modal.Footer className="dialog-footer">
+
+                    <Button variant="green" onClick={this.onFileUpload}>upload</Button>
+                    <Button variant="red" onClick={this.props.onHide}>close</Button>
+                </Modal.Footer>
+            </Modal>
+        );
+    }
+}
+
+export default Upload;
diff --git a/frontend/src/views/Upload.scss b/frontend/src/views/Upload.scss
new file mode 100644
index 0000000..e327b8c
--- /dev/null
+++ b/frontend/src/views/Upload.scss
@@ -0,0 +1,21 @@
+@import '../colors.scss';
+
+.curl-output {
+  width: 100%;
+  font-size: 13px;
+}
+
+#pcap-upload{
+	align: center;
+	width: 100%;
+}
+
+.btn-color {
+  border: 3px solid #fff;
+}
+
+.dialog-footer {
+  .btn {
+    width: 80px;
+  }
+}
-- 
cgit v1.2.3-70-g09d2