Change config file name

.vs/ProjectSettings.json

@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": null
+}

README.md

@@ -1,91 +1,53 @@
-# OpenVPN Admin
+## Raspberry Pi OpenVPN Admin using LAMP
 
 ## Summary
-Administrate its OpenVPN with a web interface (logs visualisations, users managing...) and a SQL database.
-
-![Previsualisation configuration](https://lutim.cpy.re/fUq2rxqz)
-![Previsualisation administration](https://lutim.cpy.re/wwYMkHcM)
+Administer OpenVPN Server with a web interface (Users Management, Logs, Visualizations)
 
 
 ## Prerequisite
 
-  * GNU/Linux with Bash and root access
-  * Fresh install of OpenVPN
-  * Web server (NGinx, Apache...)
-  * MySQL
-  * PHP >= 5.5 with modules:
-    * zip
-    * pdo_mysql
-  * bower
-  * unzip
-  * wget
-  * sed
-  * curl
-
-### Debian 8 Jessie
-
-````
-# apt-get install openvpn apache2 php5-mysql mysql-server php5 nodejs unzip git wget sed npm curl
-# npm install -g bower
-# ln -s /usr/bin/nodejs /usr/bin/node
-````
-
-### Debian 9 Stretch
-
-In order to install `npm`, [stretch-backports need to be added to your sources.list](https://backports.debian.org/Instructions/#index2h2).
-
-````
-# apt-get install -t stretch-backports npm nodejs
-# apt-get install openvpn apache2 php-mysql mysql-server php-zip php unzip git wget sed curl
-# npm install -g bower
-````
-
-### CentOS 7
-
-````
-# yum install epel-release
-# yum install openvpn httpd php-mysql mariadb-server php nodejs unzip git wget sed npm
-# npm install -g bower
-# systemctl enable mariadb
-# systemctl start mariadb
-````
-
-### Other distribution... (PR welcome)
+  * Raspbian or Ubuntu 20 with Bash access or remote SSH
+  * Ubuntu 21.x.x is not supprted yet
 
-## Tests
+## Installation
 
-Only tested on Debian Jessie. Feel free to open issues.
+  * Method 1 (Automatic):
+
+        wget -O - https://raw.githubusercontent.com/arvage/OpenVPN-Admin/master/online-install.sh | bash
+
+  * Method 2 (Manual):
 
-## Installation
+        sudo apt update
+        sudo apt install -y git
+        cd ~
+        git clone https://github.com/arvage/OpenVPN-Admin openvpn-admin
+        cd openvpn-admin
+        sudo ./install.sh /var/www www-data www-data
 
-  * Setup OpenVPN and the web application:
+  * Once the installation is finished browse to `http://your_hostname_or_ip/index.php?installation` to create your admin user.
 
-        $ cd ~/my_coding_workspace
-        $ git clone https://github.com/Chocobozzz/OpenVPN-Admin openvpn-admin
-        $ cd openvpn-admin
-        # ./install.sh /var/www www-data www-data
+## Tests
 
-  * Setup the web server (Apache, NGinx...) to serve the web application.
-  * Create the admin of the web application by visiting `http://your-installation/index.php?installation`
+* Rasbian: Only tested on Raspberry Pi 3 with Raspbian Buster (No GUI).
+* Ubuntu 20.04 LTS: Tested successfully
 
 ## Usage
 
-  * Start OpenVPN on the server (for example `systemctl start openvpn@server`)
   * Connect to the web application as an admin
-  * Create an user
+  * Create a user
   * User get the configurations files via the web application (and put them in */etc/openvpn*)
   * Users on GNU/Linux systems, run `chmod +x /etc/openvpn/update-resolv.sh` as root
   * User run OpenVPN (for example `systemctl start openvpn@client`)
 
 ## Update
 
-    $ git pull origin master
-    # ./update.sh /var/www
+    git pull origin master
+    ./update.sh /var/www
 
-## Desinstall
+## Uninstall
 It will remove all installed components (OpenVPN keys and configurations, the web application, iptables rules...).
 
-    # ./desinstall.sh /var/www
+    sudo ./uninstall.sh /var/www
 
 ## Use of
 

include/grids.php

@@ -77,8 +77,8 @@
 
         do {
           // Better in Kb or Mb
-          $received = ($data['log_received'] > 1000000) ? $data['log_received']/1000000 . " Mo" : $data['log_received']/1000 . " Ko";
-          $sent = ($data['log_send'] > 1000000) ? $data['log_send']/1000000 . " Mo" : $data['log_send']/1000 . " Ko";
+          $received = ($data['log_received'] > 1000000) ? floor($data['log_received']/1000000) . " MB" : floor($data['log_received']/1000) . " KB";
+          $sent = ($data['log_send'] > 1000000) ? floor($data['log_send']/1000000) . " MB" : floor($data['log_send']/1000) . " KB";
 
           // We add to the array the new line of logs
           array_push($list, array(
@@ -136,7 +136,7 @@
     $phone = "";
     $online = 0;
     $enable = 1;
-    $start = null;
+    $start = date("Y-m-d");
     $end = null;
 
     $req = $bdd->prepare('INSERT INTO user (user_id, user_pass, user_mail, user_phone, user_online, user_enable, user_start_date, user_end_date)

include/html/form/configuration.php

@@ -1,5 +1,5 @@
 <div class="row">
-  <div class="col-md-4 col-md-offset-4">
+  <div class="col-md-5 col-md-offset-3">
 
     <form id="configuration_form" method="POST" class="panel panel-default">
 
@@ -17,17 +17,10 @@
           <label for="configuration_pass">Password</label>
           <input type="password" id="configuration_pass" name="configuration_pass" class="form-control" />
         </div>
+        <input id="configuration_get" name="configuration_get" type="submit" value="ovpn Configuration File" class="btn btn-default" style="margin:10px;" />
+        <input id="windows_instruction_get" name="windows_instruction_get" type="submit" value="Windows Instructions" class="btn btn-default" style="margin:10px;" />
+        <input id="mac_instruction_get" name="mac_instruction_get" type="submit" value="MAC Instructions" class="btn btn-default" style="margin:10px;" />
 
-        <div class="form-group">
-          <label for="configuration_os">OS</label>
-          <select name="configuration_os" id="configuration_os" class="form-control">
-            <option value="gnu_linux">GNU/Linux</option>
-            <option value="osx_viscosity">OSX/Viscosity</option>
-            <option value="windows">Windows</option>
-          </select>
-        </div>
-
-        <input id="configuration_get" name="configuration_get" type="submit" value="Get configuration files" class="btn btn-default" />
       </div>
 
     </form>

include/html/grids.php

@@ -32,6 +32,7 @@ function getHistory($cfg_file, $accordion_id, $open_first_history_tab = false) {
    <li><a data-toggle="tab" href="#menu1"><span class="glyphicon glyphicon-book" aria-hidden="true"></span> OpenVPN logs</a></li>
    <li><a data-toggle="tab" href="#menu2"><span class="glyphicon glyphicon-king" aria-hidden="true"></span> Web Admins</a></li>
    <li><a data-toggle="tab" href="#menu3"><span class="glyphicon glyphicon-edit" aria-hidden="true"></span> Configs</a></li>
+    <li><a data-toggle="tab" href="#menu4"><span class="glyphicon glyphicon-edit" aria-hidden="true"></span> File name</a></li>
 </ul>
 <div class="tab-content">
 
@@ -119,10 +120,7 @@ function getHistory($cfg_file, $accordion_id, $open_first_history_tab = false) {
       <!-- configs -->
       <div class="block-grid row" id="config-cards">
          <ul class="nav nav-tabs nav-tabs-justified">
-            <li class="active"><a data-toggle="tab" href="#menu-1-0"><span class="glyphicon glyphicon-heart" aria-hidden="true"></span> Linux</a></li>
-            <li><a data-toggle="tab" href="#menu-1-1"><span class="glyphicon glyphicon-th-large" aria-hidden="true"></span> Windows</a></li>
-            <li><a data-toggle="tab" href="#menu-1-2"><span class="glyphicon glyphicon-apple" aria-hidden="true"></span> OSX</a></li>
-
+            <li><a data-toggle="tab" href="#menu-1-1"><span class="glyphicon glyphicon-th-large" aria-hidden="true"></span> Windows, Linux and OSX</a></li>
             <li id="save-config-btn" class="pull-right hidden"><a class="progress-bar-striped" href="javascript:;"><span class="glyphicon glyphicon-save" aria-hidden="true"></span></a></li>
          </ul>
          <div class="tab-content">
@@ -148,7 +146,22 @@ function getHistory($cfg_file, $accordion_id, $open_first_history_tab = false) {
 
       </div>
    </div>
-
+   <div id="menu4" class="tab-pane fade">
+      <!-- configs -->
+      <div class="block-grid row" id="config-cards">
+         <ul class="nav nav-tabs nav-tabs-justified">
+                 <li><a data-toggle="tab" href="#menu-1-0"><span class="glyphicon glyphicon-heart" aria-hidden="true"></span> Ovpn Filename (without .ovpn extension)</a></li>
+                 <li id="save-config-btn" class="pull-right hidden"><a class="progress-bar-striped" href="javascript:;"><span class="glyphicon glyphicon-save" aria-hidden="true"></span></a></li>
+         </ul>
+         <div class="tab-content">
+            <div id="menu-1-0" class="tab-pane fade in active">
+               <textarea class="form-control" data-config-file="<?= $cfg_file='client-conf/windows/filename' ?>" name="" id="" cols="30" rows="20"><?= file_get_contents($cfg_file) ?></textarea>
+               <?= getHistory($cfg_file, @++$accId) ?>
+            </div>
+         </div>
+      </div>
+   </div>
+
 </div>
 
 <script src="vendor/jquery/dist/jquery.min.js"></script>

index.php

@@ -4,65 +4,79 @@
   require(dirname(__FILE__) . '/include/functions.php');
   require(dirname(__FILE__) . '/include/connect.php');
 
+  // first time install
+  if(($_SERVER[REQUEST_URI] != "/index.php?installation") && (isInstalled($bdd) == false)) {
+    header("Location: index.php?installation");
+    exit(-1);
+  }
+
   // Disconnecting ?
   if(isset($_GET['logout'])){
     session_destroy();
     header("Location: .");
     exit(-1);
   }
 
-  // Get the configuration files ?
-  if(isset($_POST['configuration_get'], $_POST['configuration_username'], $_POST['configuration_pass'], $_POST['configuration_os'])
-     && !empty($_POST['configuration_pass'])) {
+  // Read ovpn file contents
+  $ovpn_filename= file_get_contents("./client-conf/windows/filename");
+
+  // Get the Windows instruction file 
+  if(isset($_POST['windows_instruction_get'])) {
+      $download_file_name1 = "Download and install the OpenVPN GUI (Windows).pdf";
+      $file_folder1  = "windows";
+      $file_full_path1  = './client-conf/' . $file_folder1 . '/' . $download_file_name1;
+      header("Content-type: application/pdf");
+      header("Content-disposition: attachment; filename=$download_file_name1");
+      header("Pragma: no-cache");
+      header("Expires: 0");
+      readfile($file_full_path1);
+      exit;
+     }
+
+  // Get the MAC instruction file 
+  if(isset($_POST['mac_instruction_get'])) {
+
+      $download_file_name2 = "Download and install the OpenVPN GUI (MAC).pdf";
+      $file_folder2  = "osx-viscosity";
+      $file_full_path2  = './client-conf/' . $file_folder2 . '/' . $download_file_name2;
+      header("Content-type: application/pdf");
+      header("Content-disposition: attachment; filename=$download_file_name2");
+      header("Pragma: no-cache");
+      header("Expires: 0");
+      readfile($file_full_path2);
+      exit;
+    }
+
+  // Get configuration file from admin page
+  if(isset($_GET['admin_configuration_get'])  && !empty($_SESSION['admin_id']) ) {
+    $file_name = "client.ovpn";
+    $file_folder  = "windows";
+    $file_full_path  = './client-conf/' . $file_folder . '/' . $file_name;
+    header("Content-type: application/ovpn");
+    header("Content-disposition: attachment; filename=$ovpn_filename.ovpn");
+    header("Pragma: no-cache");
+    header("Expires: 0");
+    readfile($file_full_path);
+    exit;
+  }
+
+  // Get the configuration files from configuration page
+  if(isset($_POST['configuration_get'], $_POST['configuration_username'], $_POST['configuration_pass']) && !empty($_POST['configuration_pass'])) {
     $req = $bdd->prepare('SELECT * FROM user WHERE user_id = ?');
     $req->execute(array($_POST['configuration_username']));
     $data = $req->fetch();
 
     // Error ?
     if($data && passEqual($_POST['configuration_pass'], $data['user_pass'])) {
-      // Thanks http://stackoverflow.com/questions/4914750/how-to-zip-a-whole-folder-using-php
-      if($_POST['configuration_os'] == "gnu_linux") {
-        $conf_dir = 'gnu-linux';
-      } elseif($_POST['configuration_os'] == "osx_viscosity") {
-        $conf_dir = 'osx-viscosity';
-      } else {
-        $conf_dir = 'windows';
-      }
-      $rootPath = realpath("./client-conf/$conf_dir");
-
-      // Initialize archive object ;;;; why doing this every time the user logs in, when the cert is static?
-      $archive_base_name = "openvpn-$conf_dir";
-      $archive_name = "$archive_base_name.zip";
-      $archive_path = "./client-conf/$archive_name";
-      $zip = new ZipArchive();
-      $zip->open($archive_path, ZipArchive::CREATE | ZipArchive::OVERWRITE);
-
-      $files = new RecursiveIteratorIterator(
-        new RecursiveDirectoryIterator($rootPath),
-        RecursiveIteratorIterator::LEAVES_ONLY
-      );
-
-      foreach ($files as $name => $file) {
-        // Skip directories (they would be added automatically)
-        if (!$file->isDir()) {
-          // Get real and relative path for current file
-          $filePath = $file->getRealPath();
-          $relativePath = substr($filePath, strlen($rootPath) + 1);
-
-          // Add current file to archive
-          $zip->addFile($filePath, "$archive_base_name/$relativePath");
-        }
-      }
-
-      // Zip archive will be created only after closing object
-      $zip->close();
-
-      //then send the headers to foce download the zip file
-      header("Content-type: application/zip");
-      header("Content-Disposition: attachment; filename=$archive_name");
+      $file_name = "client.ovpn";
+      $file_folder  = "windows";
+      $file_full_path  = './client-conf/' . $file_folder . '/' . $file_name;
+      header("Content-type: application/ovpn");
+      header("Content-disposition: attachment; filename=$ovpn_filename.ovpn");
       header("Pragma: no-cache");
       header("Expires: 0");
-      readfile($archive_path);
+      readfile($file_full_path);
+      exit;
     }
     else {
       $error = true;
@@ -158,11 +172,10 @@
         header( "refresh:3;url=index.php?admin" );
       }
       // Print the installation form
-      else {
+      else {    
         require(dirname(__FILE__) . '/include/html/menu.php');
         require(dirname(__FILE__) . '/include/html/form/installation.php');
       }
-
       exit(-1);
     }
 
@@ -196,6 +209,7 @@
             <div class="col-md-6">
               <a class="navbar-text navbar-right" href="index.php?logout" title="Logout"><button class="btn btn-danger">Logout <span class="glyphicon glyphicon-off" aria-hidden="true"></span></button></a>
               <a class="navbar-text navbar-right" href="index.php" title="Configuration"><button class="btn btn-default">Configurations</button></a>
+              <a class="navbar-text navbar-right" href="index.php?admin_configuration_get" title="Get Config File"><button class="btn btn-default">Get Config File</button></a>
             </p>
           </div>
         </div>
@@ -204,7 +218,7 @@
   <?php
       require(dirname(__FILE__) . '/include/html/grids.php');
     }
-  ?>
+  ?>  
      <div id="message-stage">
         <!-- used to display application messages (failures / status-notes) to the user -->
      </div>