frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-03-01 10:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19 from RaspAP/zbchristian-mods-openvpn

Browse Source 
Allow to configure OpenVPN with a client certificate
This commit is contained in:
Bill Zimmerman
2021-04-06 14:22:09 +02:00
committed by GitHub
parent 594c5dad1c d221c76e32
commit 0f333bd261
8 changed files with 113 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ajax/openvpn/activate_ovpncfg.php
View File

@@ -5,11 +5,11 @@ require_once '../../includes/functions.php';
if (isset($_POST['cfg_id'])) { if (isset($_POST['cfg_id'])) {
$ovpncfg_id = $_POST['cfg_id']; $ovpncfg_id = $_POST['cfg_id'];
$ovpncfg_path = pathinfo(RASPI_OPENVPN_CLIENT_LOGIN, PATHINFO_DIRNAME).'/'; $ovpncfg_path = pathinfo(RASPI_OPENVPN_CLIENT_CONFIG, PATHINFO_DIRNAME).'/';
$ovpncfg_files = $ovpncfg_path .$ovpncfg_id.'_*.conf'; $ovpncfg_files = $ovpncfg_path .$ovpncfg_id.'_*.conf';
// move currently active profile // move currently active profile
$meta = file_get_meta(RASPI_OPENVPN_CLIENT_LOGIN,'#\sfilename\s(.*)'); $meta = file_get_meta(RASPI_OPENVPN_CLIENT_CONFIG,'#\sfilename\s(.*)');
$ovpncfg_client = $ovpncfg_path .$meta.'_client.conf'; $ovpncfg_client = $ovpncfg_path .$meta.'_client.conf';
$ovpncfg_login = $ovpncfg_path .$meta.'_login.conf'; $ovpncfg_login = $ovpncfg_path .$meta.'_login.conf';
exec("sudo mv ".RASPI_OPENVPN_CLIENT_CONFIG." $ovpncfg_client", $return); exec("sudo mv ".RASPI_OPENVPN_CLIENT_CONFIG." $ovpncfg_client", $return);

16
app/js/custom.js
View File

@@ -282,6 +282,22 @@ $('#ovpn-confirm-activate').on('shown.bs.modal', function (e) {
$('.btn-activate', this).data('recordId', data.recordId); $('.btn-activate', this).data('recordId', data.recordId);
}); });
$('#ovpn-userpw,#ovpn-certs').on('click', function (e) {
// e.stopPropagation();
if (this.id == 'ovpn-userpw') {
$('#PanelCerts').hide();
$('#PanelUserPW').show();
} else if (this.id == 'ovpn-certs') {
$('#PanelUserPW').hide();
$('#PanelCerts').show();
}
});
// Add the following code if you want the name of the file appear on select
$(".custom-file-input").on("change", function() {
var fileName = $(this).val().split("\\").pop();
$(this).siblings(".custom-file-label").addClass("selected").html(fileName);
});
/* /*
Sets the wirelss channel select options based on hw_mode and country_code. Sets the wirelss channel select options based on hw_mode and country_code.

2
includes/openvpn.php
View File

@@ -53,7 +53,7 @@ function DisplayOpenVPNConfig()
$authUser = current($auth); $authUser = current($auth);
$authPassword = next($auth); $authPassword = next($auth);
} }
$clients = preg_grep('~\login.(conf)$~', scandir(pathinfo(RASPI_OPENVPN_CLIENT_LOGIN, PATHINFO_DIRNAME))); $clients = preg_grep('/client.(conf)$/', scandir(pathinfo(RASPI_OPENVPN_CLIENT_CONFIG, PATHINFO_DIRNAME)));
$logEnable = 0; $logEnable = 0;
if (!empty($_POST) && !isset($_POST['log-openvpn'])) { if (!empty($_POST) && !isset($_POST['log-openvpn'])) {

BIN
locale/en_US/LC_MESSAGES/messages.mo
View File

Binary file not shown.

30
locale/en_US/LC_MESSAGES/messages.po
View File

@@ -728,6 +728,36 @@ msgstr "Cancel"
msgid "Enable this option to log <code>openvpn</code> activity." msgid "Enable this option to log <code>openvpn</code> activity."
msgstr "Enable this option to log <code>openvpn</code> activity." msgstr "Enable this option to log <code>openvpn</code> activity."
msgid "Authentification Method"
msgstr "Authentification Method"
msgid "Username and password"
msgstr "Username and password"
msgid "Certificates"
msgstr "Certificates"
msgid "Enter username and password"
msgstr "Enter username and password"
msgid "Certificates in the configuration file"
msgstr "Certificates in the configuration file"
msgid "RaspAP supports certificates by including them in the configuration file."
msgstr "RaspAP supports certificates by including them in the configuration file."
msgid "Signing certification authority (CA) certificate (e.g. <code>ca.crt</code>): enclosed in <code>&lt;ca> ... &lt;/ca></code> tags."
msgstr "Signing certification authority (CA) certificate (e.g. <code>ca.crt</code>): enclosed in <code>&lt;ca> ... &lt;/ca></code> tags."
msgid "Client certificate (public key) (e.g. <code>client.crt</code>): enclosed in <code>&lt;cert> ... &lt;/cert></code> tags."
msgstr "Client certificate (public key) (e.g. <code>client.crt</code>): enclosed in <code>&lt;cert> ... &lt;/cert></code> tags."
msgid "Private key of the client certificate (e.g. <code>client.key</code>): enclosed in <code>&lt;key> ... &lt;/key></code> tags."
msgstr "Private key of the client certificate (e.g. <code>client.key</code>): enclosed in <code>&lt;key> ... &lt;/key></code> tags."
msgid "Configuration File"
msgstr "Configuration File"
#: includes/torproxy.php #: includes/torproxy.php
msgid "TOR is not running" msgid "TOR is not running"
msgstr "TOR is not running" msgstr "TOR is not running"

3
templates/openvpn.php
View File

@@ -45,8 +45,7 @@
</div><!-- /.tab-content --> </div><!-- /.tab-content -->
<?php echo $buttons ?> <?php echo $buttons ?>
</form> </form>
</div>
</div><!-- /.card-body --> </div><!-- /.card-body -->
<div class="card-footer"><?php echo _("Information provided by openvpn"); ?></div> <div class="card-footer"><?php echo _("Information provided by openvpn"); ?></div>
</div><!-- /.card --> </div><!-- /.card -->

6
templates/openvpn/configs.php
View File

@@ -8,11 +8,11 @@
</p> </p>
<div class="openvpn-configs js-openvpn-configs-container"> <div class="openvpn-configs js-openvpn-configs-container">
<?php foreach ($clients as $client) : <?php foreach ($clients as $client) :
if ($client == "login.conf") { if ($client == "client.conf") {
$label = file_get_meta(RASPI_OPENVPN_CLIENT_LOGIN,'#\sfilename\s(.*)'); $label = file_get_meta(RASPI_OPENVPN_CLIENT_CONFIG,'#\sfilename\s(.*)');
$btn_class = "active"; $btn_class = "active";
} else { } else {
$label = trim(pathinfo($client, PATHINFO_FILENAME), "_login"); $label = preg_replace('/_client$/','',pathinfo($client, PATHINFO_FILENAME));
$client = $label; $client = $label;
$btn_class = "disabled"; $btn_class = "disabled";
}?> }?>

87
templates/openvpn/general.php
View File

@@ -1,36 +1,69 @@
<div class="tab-pane active" id="openvpnclient"> <div class="tab-pane active" id="openvpnclient">
<h4 class="mt-3"><?php echo _("Client settings"); ?></h4> <h4 class="mt-3"><?php echo _("Client settings"); ?></h4>
<div class="row"> <div class="row">
<div class="col"> <div class="col-lg-8">
<div class="row"> <div class="row mb-2">
<div class="col-lg-12 mt-2 mb-2"> <div class="col-lg-12 mt-2 mb-2">
<div class="info-item"><?php echo _("IPv4 Address"); ?></div> <div class="info-item"><?php echo _("IPv4 Address"); ?></div>
<div class="info-item"><?php echo htmlspecialchars($public_ip, ENT_QUOTES); ?><a class="text-gray-500" href="https://ipapi.co/<?php echo($public_ip); ?>" target="_blank" rel="noopener noreferrer"><i class="fas fa-external-link-alt ml-2"></i></a></div> <div class="info-item"><?php echo htmlspecialchars($public_ip, ENT_QUOTES); ?><a class="text-gray-500" href="https://ipapi.co/<?php echo($public_ip); ?>" target="_blank" rel="noopener noreferrer"><i class="fas fa-external-link-alt ml-2"></i></a></div>
</div> </div>
</div> </div>
<div class="row"> <h5><?php echo _("Authentification Method"); ?></h5>
<div class="form-group col-lg-12"> <div class="col-sm-12 mt-2 mb-2 form-check">
<label for="code"><?php echo _("Username"); ?></label> <input class="form-check-input" id="ovpn-userpw" name="sel1" value="userpw" data-toggle="" data-parent="#clientsettings" data-target="#UserPW" type="radio" checked>
<input type="text" class="form-control" name="authUser" value="<?php echo htmlspecialchars($authUser, ENT_QUOTES); ?>" /> <label class="form-check-label"><?php echo _("Username and password"); ?></label>
</div>
</div> </div>
<div class="row"> <div class="col-sm-12 mt-2 mb-2 form-check">
<div class="form-group col-lg-12"> <input class="form-check-input" id="ovpn-certs" name="sel1" value="certs" data-toggle="" data-parent="#clientsettings" data-target="#Certs" type="radio">
<label for="code"><?php echo _("Password"); ?></label> <label class="form-check-label"><?php echo _("Certificates"); ?></label>
<input type="password" class="form-control" name="authPassword" value="<?php echo htmlspecialchars($authPassword, ENT_QUOTES); ?>" />
</div>
</div> </div>
<div class="row"> <div class="col-sm-12 ml-2">
<div class="form-group col-lg-12"> <div class="panel-group" id="clientsettings">
<div class="custom-file"> <div class="panel panel-default panel-collapse" id="PanelUserPW" >
<input type="file" class="custom-file-input" name="customFile" id="customFile"> <div class="panel-heading">
<label class="custom-file-label" for="customFile"><?php echo _("Select OpenVPN configuration file (.ovpn)"); ?></label> <h5 class="panel-title"><?php echo _("Enter username and password"); ?></h5>
</div> </div>
</div> <div class="panel-body">
</div> <div class="form-group col-lg-12">
</div><!-- col--> <label for="code"><?php echo _("Username"); ?></label>
<div class="col-sm"> <input type="text" class="form-control" name="authUser" value="<?php echo htmlspecialchars($authUser, ENT_QUOTES); ?>" />
<a href="https://go.nordvpn.net/aff_c?offer_id=15&aff_id=36402&url_id=902"><img src="app/img/no-trace-200x200.png" class="float-left mb-3 mt-3"></a> </div>
<div class="form-group col-lg-12">
<label for="code"><?php echo _("Password"); ?></label>
<input type="password" class="form-control" name="authPassword" value="<?php echo htmlspecialchars($authPassword, ENT_QUOTES); ?>" />
</div>
</div>
</div><!-- panel -->
<div class="panel panel-default panel-collapse collapse in" id="PanelCerts">
<div class="panel-body">
<div class="panel-heading">
<h5 class="panel-title"><?php echo _("Certificates in the configuration file"); ?></h5>
</div>
<p><?php echo _("RaspAP supports certificates by including them in the configuration file."); ?>
<ul>
<small>
<li><?php echo _("Signing certification authority (CA) certificate (e.g. <code>ca.crt</code>): enclosed in <code>&lt;ca> ... &lt;/ca></code> tags."); ?></li>
<li><?php echo _("Client certificate (public key) (e.g. <code>client.crt</code>): enclosed in <code>&lt;cert> ... &lt;/cert></code> tags."); ?></li>
<li><?php echo _("Private key of the client certificate (e.g. <code>client.key</code>): enclosed in <code>&lt;key> ... &lt;/key></code> tags."); ?></li>
</small>
</ul>
</p>
</div>
</div> <!-- panel -->
</div> <!-- panel-group -->
</div> <!-- col -->
<div class="col-sm-12 ">
<div class="form-group">
<h5 class="panel-title"><?php echo _("Configuration File"); ?></h4>
<div class="custom-file">
<input type="file" class="custom-file-input" name="customFile" id="customFile">
<label class="custom-file-label" for="customFile"><?php echo _("Select OpenVPN configuration file (.ovpn)"); ?></label>
</div>
</div>
</div> <!-- col -->
</div><!-- col-8 -->
<div class="col-sm-auto">
<a href="https://go.nordvpn.net/aff_c?offer_id=15&aff_id=36402&url_id=902"><img src="app/img/no-trace-200x200.png" class="float-left mb-3 mt-3"></a>
</div> </div>
</div><!-- /.row --> </div><!-- /.row -->
</div><!-- /.tab-pane | general tab --> </div><!-- /.tab-pane | general tab -->