Browse Source

Remove keygen usage from web client, effectlively removing certificate creation through web client (fixes #274).

pull/295/head
Simon Eisenmann 9 years ago
parent
commit
258c2aebc1
  1. 4
      server.conf.in
  2. 11
      static/partials/settings.html

4
server.conf.in

@ -154,9 +154,7 @@ enabled = false @@ -154,9 +154,7 @@ enabled = false
; The userid is provided as CommonName with a certificate provided with TLS
; client authentication. When you use this with a front end proxy for TLS
; termination, that proxy has to validate the certificate and inject certain
; headers into the proxy connection. In certificate mode the server can act as
; a signing CA to sign incoming user certificate requests with a private key
; when allowRegistration is true. While certificate mode offers the highest
; headers into the proxy connection. While certificate mode offers the highest
; security it is currently considered experimental and the user experience
; varies between browsers and platforms.
;mode = sharedsecret

11
static/partials/settings.html

@ -44,19 +44,12 @@ @@ -44,19 +44,12 @@
<div class="form-group profile-yourid">
<label class="col-xs-4 control-label">{{_('Your ID')}}</label>
<div ng-switch="withUsersMode">
<form ng-switch-when="certificate" class="col-xs-8" target="users_registration_certificate_iframe">
<div ng-if="!userid">
<keygen class="hidden" name="pubkey"/>
<label ng-if="!userid && withUsersRegistration && usersettings.registerUserid">
<button class="btn btn-small btn-primary" ng-click="usersettings.registerUserid($event)">{{_('Register')}}</button>
</label>
<iframe class="hidden" name="users_registration_certificate_iframe"></iframe>
</div>
<div ng-switch-when="certificate" class="col-xs-8">
<div ng-if="userid">
<p class="form-control-static well well-sm">{{userid|displayUserid}}</p>
<p class-"help-block">{{_('Authenticated by certificate. To log out you have to remove your certificate from the browser.')}}</p>
</div>
</form>
</div>
<div ng-switch-default class="col-xs-8">
<div ng-if="!userid && withUsersRegistration">
<label ng-if="usersettings.loginUserid">

Loading…
Cancel
Save