Merge branch 'dev'
andryyy
commit
b7106bf8fc
|
|
@ -16,6 +16,7 @@ server {
|
||||||
include /etc/nginx/conf.d/server_name.active;
|
include /etc/nginx/conf.d/server_name.active;
|
||||||
error_log /var/log/nginx/error.log;
|
error_log /var/log/nginx/error.log;
|
||||||
access_log /var/log/nginx/access.log;
|
access_log /var/log/nginx/access.log;
|
||||||
|
absolute_redirect off;
|
||||||
root /web;
|
root /web;
|
||||||
|
|
||||||
location ~ ^/api/v1/(.*)$ {
|
location ~ ^/api/v1/(.*)$ {
|
||||||
|
|
@ -33,7 +34,7 @@ server {
|
||||||
real_ip_recursive on;
|
real_ip_recursive on;
|
||||||
|
|
||||||
location = /principals/ {
|
location = /principals/ {
|
||||||
rewrite ^ $scheme://$host:$server_port/SOGo/dav;
|
rewrite ^ $scheme://$http_host/SOGo/dav;
|
||||||
allow all;
|
allow all;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -51,16 +52,12 @@ server {
|
||||||
fastcgi_read_timeout 1200;
|
fastcgi_read_timeout 1200;
|
||||||
}
|
}
|
||||||
|
|
||||||
rewrite ^(/save.+)$ /rspamd$1 last;
|
|
||||||
location /rspamd/ {
|
location /rspamd/ {
|
||||||
proxy_pass http://172.22.1.253:11334/;
|
proxy_pass http://172.22.1.253:11334/;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $http_host;
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
add_header Strict-Transport-Security "max-age=31536000; includeSubdomains";
|
proxy_redirect off;
|
||||||
add_header X-Content-Type-Options nosniff;
|
|
||||||
add_header X-Frame-Options SAMEORIGIN;
|
|
||||||
add_header X-XSS-Protection "1; mode=block";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~ /(?:a|A)utodiscover/(?:a|A)utodiscover.xml {
|
location ~ /(?:a|A)utodiscover/(?:a|A)utodiscover.xml {
|
||||||
|
|
@ -91,11 +88,11 @@ server {
|
||||||
proxy_busy_buffers_size 64k;
|
proxy_busy_buffers_size 64k;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $http_host;
|
||||||
proxy_set_header x-webobjects-server-protocol HTTP/1.0;
|
proxy_set_header x-webobjects-server-protocol HTTP/1.0;
|
||||||
proxy_set_header x-webobjects-remote-host $remote_addr;
|
proxy_set_header x-webobjects-remote-host $remote_addr;
|
||||||
proxy_set_header x-webobjects-server-name $server_name;
|
proxy_set_header x-webobjects-server-name $server_name;
|
||||||
proxy_set_header x-webobjects-server-url $scheme://$host:$server_port;
|
proxy_set_header x-webobjects-server-url $scheme://$http_host;
|
||||||
proxy_set_header x-webobjects-server-port $server_port;
|
proxy_set_header x-webobjects-server-port $server_port;
|
||||||
client_body_buffer_size 128k;
|
client_body_buffer_size 128k;
|
||||||
client_max_body_size 100m;
|
client_max_body_size 100m;
|
||||||
|
|
@ -105,11 +102,11 @@ server {
|
||||||
proxy_pass http://172.22.1.252:20000;
|
proxy_pass http://172.22.1.252:20000;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $http_host;
|
||||||
proxy_set_header x-webobjects-server-protocol HTTP/1.0;
|
proxy_set_header x-webobjects-server-protocol HTTP/1.0;
|
||||||
proxy_set_header x-webobjects-remote-host $remote_addr;
|
proxy_set_header x-webobjects-remote-host $remote_addr;
|
||||||
proxy_set_header x-webobjects-server-name $server_name;
|
proxy_set_header x-webobjects-server-name $server_name;
|
||||||
proxy_set_header x-webobjects-server-url $scheme://$host:$server_port;
|
proxy_set_header x-webobjects-server-url $scheme://$http_host;
|
||||||
proxy_set_header x-webobjects-server-port $server_port;
|
proxy_set_header x-webobjects-server-port $server_port;
|
||||||
client_body_buffer_size 128k;
|
client_body_buffer_size 128k;
|
||||||
client_max_body_size 100m;
|
client_max_body_size 100m;
|
||||||
|
|
@ -118,7 +115,7 @@ server {
|
||||||
|
|
||||||
location /SOGo.woa/WebServerResources/ {
|
location /SOGo.woa/WebServerResources/ {
|
||||||
proxy_pass http://172.22.1.252:9192/WebServerResources/;
|
proxy_pass http://172.22.1.252:9192/WebServerResources/;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $http_host;
|
||||||
proxy_cache sogo;
|
proxy_cache sogo;
|
||||||
proxy_cache_valid 200 1d;
|
proxy_cache_valid 200 1d;
|
||||||
proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504;
|
proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504;
|
||||||
|
|
@ -128,7 +125,7 @@ server {
|
||||||
|
|
||||||
location /.woa/WebServerResources/ {
|
location /.woa/WebServerResources/ {
|
||||||
proxy_pass http://172.22.1.252:9192/WebServerResources/;
|
proxy_pass http://172.22.1.252:9192/WebServerResources/;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $http_host;
|
||||||
proxy_cache sogo;
|
proxy_cache sogo;
|
||||||
proxy_cache_valid 200 1d;
|
proxy_cache_valid 200 1d;
|
||||||
proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504;
|
proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504;
|
||||||
|
|
@ -138,7 +135,7 @@ server {
|
||||||
|
|
||||||
location /SOGo/WebServerResources/ {
|
location /SOGo/WebServerResources/ {
|
||||||
proxy_pass http://172.22.1.252:9192/WebServerResources/;
|
proxy_pass http://172.22.1.252:9192/WebServerResources/;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $http_host;
|
||||||
proxy_cache sogo;
|
proxy_cache sogo;
|
||||||
proxy_cache_valid 200 1d;
|
proxy_cache_valid 200 1d;
|
||||||
proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504;
|
proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504;
|
||||||
|
|
@ -148,7 +145,7 @@ server {
|
||||||
|
|
||||||
location (^/SOGo/so/ControlPanel/Products/[^/]*UI/Resources/.*\.(jpg|png|gif|css|js)$ {
|
location (^/SOGo/so/ControlPanel/Products/[^/]*UI/Resources/.*\.(jpg|png|gif|css|js)$ {
|
||||||
proxy_pass http://172.22.1.252:9192/$1.SOGo/Resources/$2;
|
proxy_pass http://172.22.1.252:9192/$1.SOGo/Resources/$2;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $http_host;
|
||||||
proxy_cache sogo;
|
proxy_cache sogo;
|
||||||
proxy_cache_valid 200 1d;
|
proxy_cache_valid 200 1d;
|
||||||
proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504;
|
proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504;
|
||||||
|
|
@ -164,6 +161,7 @@ server {
|
||||||
include /etc/nginx/conf.d/server_name.active;
|
include /etc/nginx/conf.d/server_name.active;
|
||||||
error_log /var/log/nginx/error.log;
|
error_log /var/log/nginx/error.log;
|
||||||
access_log /var/log/nginx/access.log;
|
access_log /var/log/nginx/access.log;
|
||||||
|
absolute_redirect off;
|
||||||
root /web;
|
root /web;
|
||||||
|
|
||||||
location ~ ^/api/v1/(.*)$ {
|
location ~ ^/api/v1/(.*)$ {
|
||||||
|
|
@ -181,7 +179,7 @@ server {
|
||||||
real_ip_recursive on;
|
real_ip_recursive on;
|
||||||
|
|
||||||
location = /principals/ {
|
location = /principals/ {
|
||||||
rewrite ^ $scheme://$host:$server_port/SOGo/dav;
|
rewrite ^ $scheme://$http_host/SOGo/dav;
|
||||||
allow all;
|
allow all;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -199,20 +197,12 @@ server {
|
||||||
fastcgi_read_timeout 1200;
|
fastcgi_read_timeout 1200;
|
||||||
}
|
}
|
||||||
|
|
||||||
rewrite ^(/save.+)$ /rspamd$1 last;
|
|
||||||
location /rspamd/ {
|
location /rspamd/ {
|
||||||
proxy_pass http://172.22.1.253:11334/;
|
proxy_pass http://172.22.1.253:11334/;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $http_host;
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
add_header Strict-Transport-Security "max-age=31536000; includeSubdomains";
|
proxy_redirect off;
|
||||||
add_header X-Content-Type-Options nosniff;
|
|
||||||
add_header X-Frame-Options SAMEORIGIN;
|
|
||||||
add_header X-XSS-Protection "1; mode=block";
|
|
||||||
}
|
|
||||||
|
|
||||||
location ^~ /inc/init.sql {
|
|
||||||
deny all;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~ /(?:a|A)utodiscover/(?:a|A)utodiscover.xml {
|
location ~ /(?:a|A)utodiscover/(?:a|A)utodiscover.xml {
|
||||||
|
|
@ -243,11 +233,11 @@ server {
|
||||||
proxy_busy_buffers_size 64k;
|
proxy_busy_buffers_size 64k;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $http_host;
|
||||||
proxy_set_header x-webobjects-server-protocol HTTP/1.0;
|
proxy_set_header x-webobjects-server-protocol HTTP/1.0;
|
||||||
proxy_set_header x-webobjects-remote-host $remote_addr;
|
proxy_set_header x-webobjects-remote-host $remote_addr;
|
||||||
proxy_set_header x-webobjects-server-name $server_name;
|
proxy_set_header x-webobjects-server-name $server_name;
|
||||||
proxy_set_header x-webobjects-server-url $scheme://$host:$server_port;
|
proxy_set_header x-webobjects-server-url $scheme://$http_host;
|
||||||
proxy_set_header x-webobjects-server-port $server_port;
|
proxy_set_header x-webobjects-server-port $server_port;
|
||||||
client_body_buffer_size 128k;
|
client_body_buffer_size 128k;
|
||||||
client_max_body_size 100m;
|
client_max_body_size 100m;
|
||||||
|
|
@ -257,11 +247,11 @@ server {
|
||||||
proxy_pass http://172.22.1.252:20000;
|
proxy_pass http://172.22.1.252:20000;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $http_host;
|
||||||
proxy_set_header x-webobjects-server-protocol HTTP/1.0;
|
proxy_set_header x-webobjects-server-protocol HTTP/1.0;
|
||||||
proxy_set_header x-webobjects-remote-host $remote_addr;
|
proxy_set_header x-webobjects-remote-host $remote_addr;
|
||||||
proxy_set_header x-webobjects-server-name $server_name;
|
proxy_set_header x-webobjects-server-name $server_name;
|
||||||
proxy_set_header x-webobjects-server-url $scheme://$host:$server_port;
|
proxy_set_header x-webobjects-server-url $scheme://$http_host;
|
||||||
proxy_set_header x-webobjects-server-port $server_port;
|
proxy_set_header x-webobjects-server-port $server_port;
|
||||||
client_body_buffer_size 128k;
|
client_body_buffer_size 128k;
|
||||||
client_max_body_size 100m;
|
client_max_body_size 100m;
|
||||||
|
|
@ -270,7 +260,7 @@ server {
|
||||||
|
|
||||||
location /SOGo.woa/WebServerResources/ {
|
location /SOGo.woa/WebServerResources/ {
|
||||||
proxy_pass http://172.22.1.252:9192/WebServerResources/;
|
proxy_pass http://172.22.1.252:9192/WebServerResources/;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $http_host;
|
||||||
proxy_cache sogo;
|
proxy_cache sogo;
|
||||||
proxy_cache_valid 200 1d;
|
proxy_cache_valid 200 1d;
|
||||||
proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504;
|
proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504;
|
||||||
|
|
@ -280,7 +270,7 @@ server {
|
||||||
|
|
||||||
location /.woa/WebServerResources/ {
|
location /.woa/WebServerResources/ {
|
||||||
proxy_pass http://172.22.1.252:9192/WebServerResources/;
|
proxy_pass http://172.22.1.252:9192/WebServerResources/;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $http_host;
|
||||||
proxy_cache sogo;
|
proxy_cache sogo;
|
||||||
proxy_cache_valid 200 1d;
|
proxy_cache_valid 200 1d;
|
||||||
proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504;
|
proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504;
|
||||||
|
|
@ -290,7 +280,7 @@ server {
|
||||||
|
|
||||||
location /SOGo/WebServerResources/ {
|
location /SOGo/WebServerResources/ {
|
||||||
proxy_pass http://172.22.1.252:9192/WebServerResources/;
|
proxy_pass http://172.22.1.252:9192/WebServerResources/;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $http_host;
|
||||||
proxy_cache sogo;
|
proxy_cache sogo;
|
||||||
proxy_cache_valid 200 1d;
|
proxy_cache_valid 200 1d;
|
||||||
proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504;
|
proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504;
|
||||||
|
|
@ -300,7 +290,7 @@ server {
|
||||||
|
|
||||||
location (^/SOGo/so/ControlPanel/Products/[^/]*UI/Resources/.*\.(jpg|png|gif|css|js)$ {
|
location (^/SOGo/so/ControlPanel/Products/[^/]*UI/Resources/.*\.(jpg|png|gif|css|js)$ {
|
||||||
proxy_pass http://172.22.1.252:9192/$1.SOGo/Resources/$2;
|
proxy_pass http://172.22.1.252:9192/$1.SOGo/Resources/$2;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $http_host;
|
||||||
proxy_cache sogo;
|
proxy_cache sogo;
|
||||||
proxy_cache_valid 200 1d;
|
proxy_cache_valid 200 1d;
|
||||||
proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504;
|
proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504;
|
||||||
|
|
|
||||||
|
|
@ -67,6 +67,7 @@ $tfa_data = get_tfa();
|
||||||
<select data-width="auto" id="selectTFA" class="selectpicker" title="<?=$lang['tfa']['select'];?>">
|
<select data-width="auto" id="selectTFA" class="selectpicker" title="<?=$lang['tfa']['select'];?>">
|
||||||
<option value="yubi_otp"><?=$lang['tfa']['yubi_otp'];?></option>
|
<option value="yubi_otp"><?=$lang['tfa']['yubi_otp'];?></option>
|
||||||
<option value="u2f"><?=$lang['tfa']['u2f'];?></option>
|
<option value="u2f"><?=$lang['tfa']['u2f'];?></option>
|
||||||
|
<option value="totp"><?=$lang['tfa']['totp'];?></option>
|
||||||
<option value="none"><?=$lang['tfa']['none'];?></option>
|
<option value="none"><?=$lang['tfa']['none'];?></option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -34,3 +34,8 @@ table.footable>tbody>tr.footable-empty>td {
|
||||||
#alias_table .footable-paging {
|
#alias_table .footable-paging {
|
||||||
cursor: auto;
|
cursor: auto;
|
||||||
}
|
}
|
||||||
|
@media (min-width: 992px) {
|
||||||
|
.container {
|
||||||
|
width: 80%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -55,3 +55,4 @@ body.modal-open {
|
||||||
overflow: inherit;
|
overflow: inherit;
|
||||||
padding-right: inherit !important;
|
padding-right: inherit !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -93,6 +93,10 @@ $(document).ready(function() {
|
||||||
$('#YubiOTPModal').modal('show');
|
$('#YubiOTPModal').modal('show');
|
||||||
$("option:selected").prop("selected", false);
|
$("option:selected").prop("selected", false);
|
||||||
}
|
}
|
||||||
|
if ($(this).val() == "totp") {
|
||||||
|
$('#TOTPModal').modal('show');
|
||||||
|
$("option:selected").prop("selected", false);
|
||||||
|
}
|
||||||
if ($(this).val() == "u2f") {
|
if ($(this).val() == "u2f") {
|
||||||
$('#U2FModal').modal('show');
|
$('#U2FModal').modal('show');
|
||||||
$("option:selected").prop("selected", false);
|
$("option:selected").prop("selected", false);
|
||||||
|
|
@ -141,25 +145,27 @@ $(document).ready(function() {
|
||||||
// Remember last navigation pill
|
// Remember last navigation pill
|
||||||
(function () {
|
(function () {
|
||||||
'use strict';
|
'use strict';
|
||||||
$('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
|
if ($('a[data-toggle="tab"]').length) {
|
||||||
var id = $(this).parents('[role="tablist"]').attr('id');
|
$('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
|
||||||
var key = 'lastTag';
|
var id = $(this).parents('[role="tablist"]').attr('id');
|
||||||
if (id) {
|
var key = 'lastTag';
|
||||||
key += ':' + id;
|
if (id) {
|
||||||
}
|
key += ':' + id;
|
||||||
localStorage.setItem(key, $(e.target).attr('href'));
|
}
|
||||||
});
|
localStorage.setItem(key, $(e.target).attr('href'));
|
||||||
$('[role="tablist"]').each(function (idx, elem) {
|
});
|
||||||
var id = $(elem).attr('id');
|
$('[role="tablist"]').each(function (idx, elem) {
|
||||||
var key = 'lastTag';
|
var id = $(elem).attr('id');
|
||||||
if (id) {
|
var key = 'lastTag';
|
||||||
key += ':' + id;
|
if (id) {
|
||||||
}
|
key += ':' + id;
|
||||||
var lastTab = localStorage.getItem(key);
|
}
|
||||||
if (lastTab) {
|
var lastTab = localStorage.getItem(key);
|
||||||
$('[href="' + lastTab + '"]').tab('show');
|
if (lastTab) {
|
||||||
}
|
$('[href="' + lastTab + '"]').tab('show');
|
||||||
});
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
})();
|
})();
|
||||||
|
|
||||||
// Disable submit after submitting form
|
// Disable submit after submitting form
|
||||||
|
|
|
||||||
|
|
@ -1754,6 +1754,7 @@ function set_tfa($postarray) {
|
||||||
global $pdo;
|
global $pdo;
|
||||||
global $yubi;
|
global $yubi;
|
||||||
global $u2f;
|
global $u2f;
|
||||||
|
global $tfa;
|
||||||
|
|
||||||
if ($_SESSION['mailcow_cc_role'] != "domainadmin" &&
|
if ($_SESSION['mailcow_cc_role'] != "domainadmin" &&
|
||||||
$_SESSION['mailcow_cc_role'] != "admin") {
|
$_SESSION['mailcow_cc_role'] != "admin") {
|
||||||
|
|
@ -1850,6 +1851,36 @@ function set_tfa($postarray) {
|
||||||
'msg' => "U2F: " . $e->getMessage()
|
'msg' => "U2F: " . $e->getMessage()
|
||||||
);
|
);
|
||||||
$_SESSION['regReq'] = null;
|
$_SESSION['regReq'] = null;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case "totp":
|
||||||
|
(!isset($postarray["key_id"])) ? $key_id = 'unidentified' : $key_id = $postarray["key_id"];
|
||||||
|
if ($tfa->verifyCode($_POST['totp_secret'], $_POST['totp_confirm_token']) === true) {
|
||||||
|
try {
|
||||||
|
$stmt = $pdo->prepare("DELETE FROM `tfa` WHERE `username` = :username");
|
||||||
|
$stmt->execute(array(':username' => $username));
|
||||||
|
$stmt = $pdo->prepare("INSERT INTO `tfa` (`username`, `key_id`, `authmech`, `secret`, `active`) VALUES (?, ?, 'totp', ?, '1')");
|
||||||
|
$stmt->execute(array($username, $key_id, $_POST['totp_secret']));
|
||||||
|
}
|
||||||
|
catch (PDOException $e) {
|
||||||
|
$_SESSION['return'] = array(
|
||||||
|
'type' => 'danger',
|
||||||
|
'msg' => 'MySQL: '.$e
|
||||||
|
);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
$_SESSION['return'] = array(
|
||||||
|
'type' => 'success',
|
||||||
|
'msg' => sprintf($lang['success']['object_modified'], $username)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$_SESSION['return'] = array(
|
||||||
|
'type' => 'danger',
|
||||||
|
'msg' => 'TOTP verification failed'
|
||||||
|
);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
@ -1970,8 +2001,16 @@ function get_tfa($username = null) {
|
||||||
case "totp":
|
case "totp":
|
||||||
$data['name'] = "totp";
|
$data['name'] = "totp";
|
||||||
$data['pretty'] = "Time-based OTP";
|
$data['pretty'] = "Time-based OTP";
|
||||||
|
$stmt = $pdo->prepare("SELECT `id`, `key_id`, `secret` FROM `tfa` WHERE `authmech` = 'totp' AND `username` = :username");
|
||||||
|
$stmt->execute(array(
|
||||||
|
':username' => $username,
|
||||||
|
));
|
||||||
|
$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
||||||
|
while($row = array_shift($rows)) {
|
||||||
|
$data['additional'][] = $row;
|
||||||
|
}
|
||||||
return $data;
|
return $data;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$data['name'] = 'none';
|
$data['name'] = 'none';
|
||||||
$data['pretty'] = "-";
|
$data['pretty'] = "-";
|
||||||
|
|
@ -1983,6 +2022,8 @@ function verify_tfa_login($username, $token) {
|
||||||
global $pdo;
|
global $pdo;
|
||||||
global $lang;
|
global $lang;
|
||||||
global $yubi;
|
global $yubi;
|
||||||
|
global $u2f;
|
||||||
|
global $tfa;
|
||||||
|
|
||||||
$stmt = $pdo->prepare("SELECT `authmech` FROM `tfa`
|
$stmt = $pdo->prepare("SELECT `authmech` FROM `tfa`
|
||||||
WHERE `username` = :username AND `active` = '1'");
|
WHERE `username` = :username AND `active` = '1'");
|
||||||
|
|
@ -2020,7 +2061,6 @@ function verify_tfa_login($username, $token) {
|
||||||
break;
|
break;
|
||||||
case "u2f":
|
case "u2f":
|
||||||
try {
|
try {
|
||||||
global $u2f;
|
|
||||||
$reg = $u2f->doAuthenticate(json_decode($_SESSION['authReq']), get_u2f_registrations($username), json_decode($token));
|
$reg = $u2f->doAuthenticate(json_decode($_SESSION['authReq']), get_u2f_registrations($username), json_decode($token));
|
||||||
$stmt = $pdo->prepare("UPDATE `tfa` SET `counter` = ? WHERE `id` = ?");
|
$stmt = $pdo->prepare("UPDATE `tfa` SET `counter` = ? WHERE `id` = ?");
|
||||||
$stmt->execute(array($reg->counter, $reg->id));
|
$stmt->execute(array($reg->counter, $reg->id));
|
||||||
|
|
@ -2042,7 +2082,26 @@ function verify_tfa_login($username, $token) {
|
||||||
return false;
|
return false;
|
||||||
break;
|
break;
|
||||||
case "totp":
|
case "totp":
|
||||||
|
try {
|
||||||
|
$stmt = $pdo->prepare("SELECT `id`, `secret` FROM `tfa`
|
||||||
|
WHERE `username` = :username
|
||||||
|
AND `authmech` = 'totp'
|
||||||
|
AND `active`='1'");
|
||||||
|
$stmt->execute(array(':username' => $username));
|
||||||
|
$row = $stmt->fetch(PDO::FETCH_ASSOC);
|
||||||
|
if ($tfa->verifyCode($row['secret'], $_POST['token']) === true) {
|
||||||
|
$_SESSION['tfa_id'] = $row['id'];
|
||||||
|
return true;
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
catch (PDOException $e) {
|
||||||
|
$_SESSION['return'] = array(
|
||||||
|
'type' => 'danger',
|
||||||
|
'msg' => 'MySQL: '.$e
|
||||||
|
);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
|
|
|
||||||
|
|
@ -94,7 +94,7 @@ function init_db_schema() {
|
||||||
"aliases" => "INT(10) NOT NULL DEFAULT '0'",
|
"aliases" => "INT(10) NOT NULL DEFAULT '0'",
|
||||||
"mailboxes" => "INT(10) NOT NULL DEFAULT '0'",
|
"mailboxes" => "INT(10) NOT NULL DEFAULT '0'",
|
||||||
"maxquota" => "BIGINT(20) NOT NULL DEFAULT '0'",
|
"maxquota" => "BIGINT(20) NOT NULL DEFAULT '0'",
|
||||||
"quota" => "BIGINT(20) NOT NULL DEFAULT '0'",
|
"quota" => "BIGINT(20) NOT NULL DEFAULT '102400'",
|
||||||
"transport" => "VARCHAR(255) NOT NULL",
|
"transport" => "VARCHAR(255) NOT NULL",
|
||||||
"backupmx" => "TINYINT(1) NOT NULL DEFAULT '0'",
|
"backupmx" => "TINYINT(1) NOT NULL DEFAULT '0'",
|
||||||
"relay_all_recipients" => "TINYINT(1) NOT NULL DEFAULT '0'",
|
"relay_all_recipients" => "TINYINT(1) NOT NULL DEFAULT '0'",
|
||||||
|
|
@ -177,7 +177,7 @@ function init_db_schema() {
|
||||||
"password" => "VARCHAR(255) NOT NULL",
|
"password" => "VARCHAR(255) NOT NULL",
|
||||||
"name" => "VARCHAR(255)",
|
"name" => "VARCHAR(255)",
|
||||||
"maildir" => "VARCHAR(255) NOT NULL",
|
"maildir" => "VARCHAR(255) NOT NULL",
|
||||||
"quota" => "BIGINT(20) NOT NULL DEFAULT '0'",
|
"quota" => "BIGINT(20) NOT NULL DEFAULT '102400'",
|
||||||
"local_part" => "VARCHAR(255) NOT NULL",
|
"local_part" => "VARCHAR(255) NOT NULL",
|
||||||
"domain" => "VARCHAR(255) NOT NULL",
|
"domain" => "VARCHAR(255) NOT NULL",
|
||||||
"tls_enforce_in" => "TINYINT(1) NOT NULL DEFAULT '0'",
|
"tls_enforce_in" => "TINYINT(1) NOT NULL DEFAULT '0'",
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"require": {
|
||||||
|
"robthree/twofactorauth": "^1.6",
|
||||||
|
"yubico/u2flib-server": "^1.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,100 @@
|
||||||
|
{
|
||||||
|
"_readme": [
|
||||||
|
"This file locks the dependencies of your project to a known state",
|
||||||
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||||
|
"This file is @generated automatically"
|
||||||
|
],
|
||||||
|
"content-hash": "5652a086b6d277d72d7ae0341e517b1e",
|
||||||
|
"packages": [
|
||||||
|
{
|
||||||
|
"name": "robthree/twofactorauth",
|
||||||
|
"version": "1.6",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/RobThree/TwoFactorAuth.git",
|
||||||
|
"reference": "5093ab230cd8f1296d792afb6a49545f37e7fd5a"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/RobThree/TwoFactorAuth/zipball/5093ab230cd8f1296d792afb6a49545f37e7fd5a",
|
||||||
|
"reference": "5093ab230cd8f1296d792afb6a49545f37e7fd5a",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "@stable"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"RobThree\\Auth\\": "lib"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Rob Janssen",
|
||||||
|
"homepage": "http://robiii.me",
|
||||||
|
"role": "Developer"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Two Factor Authentication",
|
||||||
|
"homepage": "https://github.com/RobThree/TwoFactorAuth",
|
||||||
|
"keywords": [
|
||||||
|
"Authentication",
|
||||||
|
"MFA",
|
||||||
|
"Multi Factor Authentication",
|
||||||
|
"Two Factor Authentication",
|
||||||
|
"authenticator",
|
||||||
|
"authy",
|
||||||
|
"php",
|
||||||
|
"tfa"
|
||||||
|
],
|
||||||
|
"time": "2017-02-17T15:24:54+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "yubico/u2flib-server",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/Yubico/php-u2flib-server.git",
|
||||||
|
"reference": "407eb21da24150aad30bcd8cc0ee72963eac5e9d"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/Yubico/php-u2flib-server/zipball/407eb21da24150aad30bcd8cc0ee72963eac5e9d",
|
||||||
|
"reference": "407eb21da24150aad30bcd8cc0ee72963eac5e9d",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"ext-openssl": "*"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"classmap": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"BSD-2-Clause"
|
||||||
|
],
|
||||||
|
"description": "Library for U2F implementation",
|
||||||
|
"homepage": "https://developers.yubico.com/php-u2flib-server",
|
||||||
|
"time": "2016-02-19T09:47:51+00:00"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"packages-dev": [],
|
||||||
|
"aliases": [],
|
||||||
|
"minimum-stability": "stable",
|
||||||
|
"stability-flags": [],
|
||||||
|
"prefer-stable": false,
|
||||||
|
"prefer-lowest": false,
|
||||||
|
"platform": [],
|
||||||
|
"platform-dev": []
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
// autoload.php @generated by Composer
|
||||||
|
|
||||||
|
require_once __DIR__ . '/composer/autoload_real.php';
|
||||||
|
|
||||||
|
return ComposerAutoloaderInit873464e4bd965a3168f133248b1b218b::getLoader();
|
||||||
|
|
@ -0,0 +1,445 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of Composer.
|
||||||
|
*
|
||||||
|
* (c) Nils Adermann <naderman@naderman.de>
|
||||||
|
* Jordi Boggiano <j.boggiano@seld.be>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Composer\Autoload;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
|
||||||
|
*
|
||||||
|
* $loader = new \Composer\Autoload\ClassLoader();
|
||||||
|
*
|
||||||
|
* // register classes with namespaces
|
||||||
|
* $loader->add('Symfony\Component', __DIR__.'/component');
|
||||||
|
* $loader->add('Symfony', __DIR__.'/framework');
|
||||||
|
*
|
||||||
|
* // activate the autoloader
|
||||||
|
* $loader->register();
|
||||||
|
*
|
||||||
|
* // to enable searching the include path (eg. for PEAR packages)
|
||||||
|
* $loader->setUseIncludePath(true);
|
||||||
|
*
|
||||||
|
* In this example, if you try to use a class in the Symfony\Component
|
||||||
|
* namespace or one of its children (Symfony\Component\Console for instance),
|
||||||
|
* the autoloader will first look for the class under the component/
|
||||||
|
* directory, and it will then fallback to the framework/ directory if not
|
||||||
|
* found before giving up.
|
||||||
|
*
|
||||||
|
* This class is loosely based on the Symfony UniversalClassLoader.
|
||||||
|
*
|
||||||
|
* @author Fabien Potencier <fabien@symfony.com>
|
||||||
|
* @author Jordi Boggiano <j.boggiano@seld.be>
|
||||||
|
* @see http://www.php-fig.org/psr/psr-0/
|
||||||
|
* @see http://www.php-fig.org/psr/psr-4/
|
||||||
|
*/
|
||||||
|
class ClassLoader
|
||||||
|
{
|
||||||
|
// PSR-4
|
||||||
|
private $prefixLengthsPsr4 = array();
|
||||||
|
private $prefixDirsPsr4 = array();
|
||||||
|
private $fallbackDirsPsr4 = array();
|
||||||
|
|
||||||
|
// PSR-0
|
||||||
|
private $prefixesPsr0 = array();
|
||||||
|
private $fallbackDirsPsr0 = array();
|
||||||
|
|
||||||
|
private $useIncludePath = false;
|
||||||
|
private $classMap = array();
|
||||||
|
private $classMapAuthoritative = false;
|
||||||
|
private $missingClasses = array();
|
||||||
|
private $apcuPrefix;
|
||||||
|
|
||||||
|
public function getPrefixes()
|
||||||
|
{
|
||||||
|
if (!empty($this->prefixesPsr0)) {
|
||||||
|
return call_user_func_array('array_merge', $this->prefixesPsr0);
|
||||||
|
}
|
||||||
|
|
||||||
|
return array();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getPrefixesPsr4()
|
||||||
|
{
|
||||||
|
return $this->prefixDirsPsr4;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getFallbackDirs()
|
||||||
|
{
|
||||||
|
return $this->fallbackDirsPsr0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getFallbackDirsPsr4()
|
||||||
|
{
|
||||||
|
return $this->fallbackDirsPsr4;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getClassMap()
|
||||||
|
{
|
||||||
|
return $this->classMap;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array $classMap Class to filename map
|
||||||
|
*/
|
||||||
|
public function addClassMap(array $classMap)
|
||||||
|
{
|
||||||
|
if ($this->classMap) {
|
||||||
|
$this->classMap = array_merge($this->classMap, $classMap);
|
||||||
|
} else {
|
||||||
|
$this->classMap = $classMap;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registers a set of PSR-0 directories for a given prefix, either
|
||||||
|
* appending or prepending to the ones previously set for this prefix.
|
||||||
|
*
|
||||||
|
* @param string $prefix The prefix
|
||||||
|
* @param array|string $paths The PSR-0 root directories
|
||||||
|
* @param bool $prepend Whether to prepend the directories
|
||||||
|
*/
|
||||||
|
public function add($prefix, $paths, $prepend = false)
|
||||||
|
{
|
||||||
|
if (!$prefix) {
|
||||||
|
if ($prepend) {
|
||||||
|
$this->fallbackDirsPsr0 = array_merge(
|
||||||
|
(array) $paths,
|
||||||
|
$this->fallbackDirsPsr0
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
$this->fallbackDirsPsr0 = array_merge(
|
||||||
|
$this->fallbackDirsPsr0,
|
||||||
|
(array) $paths
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$first = $prefix[0];
|
||||||
|
if (!isset($this->prefixesPsr0[$first][$prefix])) {
|
||||||
|
$this->prefixesPsr0[$first][$prefix] = (array) $paths;
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if ($prepend) {
|
||||||
|
$this->prefixesPsr0[$first][$prefix] = array_merge(
|
||||||
|
(array) $paths,
|
||||||
|
$this->prefixesPsr0[$first][$prefix]
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
$this->prefixesPsr0[$first][$prefix] = array_merge(
|
||||||
|
$this->prefixesPsr0[$first][$prefix],
|
||||||
|
(array) $paths
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registers a set of PSR-4 directories for a given namespace, either
|
||||||
|
* appending or prepending to the ones previously set for this namespace.
|
||||||
|
*
|
||||||
|
* @param string $prefix The prefix/namespace, with trailing '\\'
|
||||||
|
* @param array|string $paths The PSR-4 base directories
|
||||||
|
* @param bool $prepend Whether to prepend the directories
|
||||||
|
*
|
||||||
|
* @throws \InvalidArgumentException
|
||||||
|
*/
|
||||||
|
public function addPsr4($prefix, $paths, $prepend = false)
|
||||||
|
{
|
||||||
|
if (!$prefix) {
|
||||||
|
// Register directories for the root namespace.
|
||||||
|
if ($prepend) {
|
||||||
|
$this->fallbackDirsPsr4 = array_merge(
|
||||||
|
(array) $paths,
|
||||||
|
$this->fallbackDirsPsr4
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
$this->fallbackDirsPsr4 = array_merge(
|
||||||
|
$this->fallbackDirsPsr4,
|
||||||
|
(array) $paths
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} elseif (!isset($this->prefixDirsPsr4[$prefix])) {
|
||||||
|
// Register directories for a new namespace.
|
||||||
|
$length = strlen($prefix);
|
||||||
|
if ('\\' !== $prefix[$length - 1]) {
|
||||||
|
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
|
||||||
|
}
|
||||||
|
$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
|
||||||
|
$this->prefixDirsPsr4[$prefix] = (array) $paths;
|
||||||
|
} elseif ($prepend) {
|
||||||
|
// Prepend directories for an already registered namespace.
|
||||||
|
$this->prefixDirsPsr4[$prefix] = array_merge(
|
||||||
|
(array) $paths,
|
||||||
|
$this->prefixDirsPsr4[$prefix]
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
// Append directories for an already registered namespace.
|
||||||
|
$this->prefixDirsPsr4[$prefix] = array_merge(
|
||||||
|
$this->prefixDirsPsr4[$prefix],
|
||||||
|
(array) $paths
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registers a set of PSR-0 directories for a given prefix,
|
||||||
|
* replacing any others previously set for this prefix.
|
||||||
|
*
|
||||||
|
* @param string $prefix The prefix
|
||||||
|
* @param array|string $paths The PSR-0 base directories
|
||||||
|
*/
|
||||||
|
public function set($prefix, $paths)
|
||||||
|
{
|
||||||
|
if (!$prefix) {
|
||||||
|
$this->fallbackDirsPsr0 = (array) $paths;
|
||||||
|
} else {
|
||||||
|
$this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registers a set of PSR-4 directories for a given namespace,
|
||||||
|
* replacing any others previously set for this namespace.
|
||||||
|
*
|
||||||
|
* @param string $prefix The prefix/namespace, with trailing '\\'
|
||||||
|
* @param array|string $paths The PSR-4 base directories
|
||||||
|
*
|
||||||
|
* @throws \InvalidArgumentException
|
||||||
|
*/
|
||||||
|
public function setPsr4($prefix, $paths)
|
||||||
|
{
|
||||||
|
if (!$prefix) {
|
||||||
|
$this->fallbackDirsPsr4 = (array) $paths;
|
||||||
|
} else {
|
||||||
|
$length = strlen($prefix);
|
||||||
|
if ('\\' !== $prefix[$length - 1]) {
|
||||||
|
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
|
||||||
|
}
|
||||||
|
$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
|
||||||
|
$this->prefixDirsPsr4[$prefix] = (array) $paths;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Turns on searching the include path for class files.
|
||||||
|
*
|
||||||
|
* @param bool $useIncludePath
|
||||||
|
*/
|
||||||
|
public function setUseIncludePath($useIncludePath)
|
||||||
|
{
|
||||||
|
$this->useIncludePath = $useIncludePath;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Can be used to check if the autoloader uses the include path to check
|
||||||
|
* for classes.
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function getUseIncludePath()
|
||||||
|
{
|
||||||
|
return $this->useIncludePath;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Turns off searching the prefix and fallback directories for classes
|
||||||
|
* that have not been registered with the class map.
|
||||||
|
*
|
||||||
|
* @param bool $classMapAuthoritative
|
||||||
|
*/
|
||||||
|
public function setClassMapAuthoritative($classMapAuthoritative)
|
||||||
|
{
|
||||||
|
$this->classMapAuthoritative = $classMapAuthoritative;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Should class lookup fail if not found in the current class map?
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function isClassMapAuthoritative()
|
||||||
|
{
|
||||||
|
return $this->classMapAuthoritative;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* APCu prefix to use to cache found/not-found classes, if the extension is enabled.
|
||||||
|
*
|
||||||
|
* @param string|null $apcuPrefix
|
||||||
|
*/
|
||||||
|
public function setApcuPrefix($apcuPrefix)
|
||||||
|
{
|
||||||
|
$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The APCu prefix in use, or null if APCu caching is not enabled.
|
||||||
|
*
|
||||||
|
* @return string|null
|
||||||
|
*/
|
||||||
|
public function getApcuPrefix()
|
||||||
|
{
|
||||||
|
return $this->apcuPrefix;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registers this instance as an autoloader.
|
||||||
|
*
|
||||||
|
* @param bool $prepend Whether to prepend the autoloader or not
|
||||||
|
*/
|
||||||
|
public function register($prepend = false)
|
||||||
|
{
|
||||||
|
spl_autoload_register(array($this, 'loadClass'), true, $prepend);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unregisters this instance as an autoloader.
|
||||||
|
*/
|
||||||
|
public function unregister()
|
||||||
|
{
|
||||||
|
spl_autoload_unregister(array($this, 'loadClass'));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Loads the given class or interface.
|
||||||
|
*
|
||||||
|
* @param string $class The name of the class
|
||||||
|
* @return bool|null True if loaded, null otherwise
|
||||||
|
*/
|
||||||
|
public function loadClass($class)
|
||||||
|
{
|
||||||
|
if ($file = $this->findFile($class)) {
|
||||||
|
includeFile($file);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Finds the path to the file where the class is defined.
|
||||||
|
*
|
||||||
|
* @param string $class The name of the class
|
||||||
|
*
|
||||||
|
* @return string|false The path if found, false otherwise
|
||||||
|
*/
|
||||||
|
public function findFile($class)
|
||||||
|
{
|
||||||
|
// class map lookup
|
||||||
|
if (isset($this->classMap[$class])) {
|
||||||
|
return $this->classMap[$class];
|
||||||
|
}
|
||||||
|
if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (null !== $this->apcuPrefix) {
|
||||||
|
$file = apcu_fetch($this->apcuPrefix.$class, $hit);
|
||||||
|
if ($hit) {
|
||||||
|
return $file;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$file = $this->findFileWithExtension($class, '.php');
|
||||||
|
|
||||||
|
// Search for Hack files if we are running on HHVM
|
||||||
|
if (false === $file && defined('HHVM_VERSION')) {
|
||||||
|
$file = $this->findFileWithExtension($class, '.hh');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (null !== $this->apcuPrefix) {
|
||||||
|
apcu_add($this->apcuPrefix.$class, $file);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (false === $file) {
|
||||||
|
// Remember that this class does not exist.
|
||||||
|
$this->missingClasses[$class] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $file;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function findFileWithExtension($class, $ext)
|
||||||
|
{
|
||||||
|
// PSR-4 lookup
|
||||||
|
$logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
|
||||||
|
|
||||||
|
$first = $class[0];
|
||||||
|
if (isset($this->prefixLengthsPsr4[$first])) {
|
||||||
|
$subPath = $class;
|
||||||
|
while (false !== $lastPos = strrpos($subPath, '\\')) {
|
||||||
|
$subPath = substr($subPath, 0, $lastPos);
|
||||||
|
$search = $subPath.'\\';
|
||||||
|
if (isset($this->prefixDirsPsr4[$search])) {
|
||||||
|
foreach ($this->prefixDirsPsr4[$search] as $dir) {
|
||||||
|
$length = $this->prefixLengthsPsr4[$first][$search];
|
||||||
|
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
|
||||||
|
return $file;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// PSR-4 fallback dirs
|
||||||
|
foreach ($this->fallbackDirsPsr4 as $dir) {
|
||||||
|
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
|
||||||
|
return $file;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// PSR-0 lookup
|
||||||
|
if (false !== $pos = strrpos($class, '\\')) {
|
||||||
|
// namespaced class name
|
||||||
|
$logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
|
||||||
|
. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
|
||||||
|
} else {
|
||||||
|
// PEAR-like class name
|
||||||
|
$logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($this->prefixesPsr0[$first])) {
|
||||||
|
foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
|
||||||
|
if (0 === strpos($class, $prefix)) {
|
||||||
|
foreach ($dirs as $dir) {
|
||||||
|
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
|
||||||
|
return $file;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// PSR-0 fallback dirs
|
||||||
|
foreach ($this->fallbackDirsPsr0 as $dir) {
|
||||||
|
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
|
||||||
|
return $file;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// PSR-0 include paths.
|
||||||
|
if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
|
||||||
|
return $file;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Scope isolated include.
|
||||||
|
*
|
||||||
|
* Prevents access to $this/self from included files.
|
||||||
|
*/
|
||||||
|
function includeFile($file)
|
||||||
|
{
|
||||||
|
include $file;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
|
||||||
|
Copyright (c) Nils Adermann, Jordi Boggiano
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is furnished
|
||||||
|
to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
THE SOFTWARE.
|
||||||
|
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
// autoload_classmap.php @generated by Composer
|
||||||
|
|
||||||
|
$vendorDir = dirname(dirname(__FILE__));
|
||||||
|
$baseDir = dirname($vendorDir);
|
||||||
|
|
||||||
|
return array(
|
||||||
|
'u2flib_server\\Error' => $vendorDir . '/yubico/u2flib-server/src/u2flib_server/U2F.php',
|
||||||
|
'u2flib_server\\RegisterRequest' => $vendorDir . '/yubico/u2flib-server/src/u2flib_server/U2F.php',
|
||||||
|
'u2flib_server\\Registration' => $vendorDir . '/yubico/u2flib-server/src/u2flib_server/U2F.php',
|
||||||
|
'u2flib_server\\SignRequest' => $vendorDir . '/yubico/u2flib-server/src/u2flib_server/U2F.php',
|
||||||
|
'u2flib_server\\U2F' => $vendorDir . '/yubico/u2flib-server/src/u2flib_server/U2F.php',
|
||||||
|
);
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
// autoload_namespaces.php @generated by Composer
|
||||||
|
|
||||||
|
$vendorDir = dirname(dirname(__FILE__));
|
||||||
|
$baseDir = dirname($vendorDir);
|
||||||
|
|
||||||
|
return array(
|
||||||
|
);
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
// autoload_psr4.php @generated by Composer
|
||||||
|
|
||||||
|
$vendorDir = dirname(dirname(__FILE__));
|
||||||
|
$baseDir = dirname($vendorDir);
|
||||||
|
|
||||||
|
return array(
|
||||||
|
'RobThree\\Auth\\' => array($vendorDir . '/robthree/twofactorauth/lib'),
|
||||||
|
);
|
||||||
|
|
@ -0,0 +1,52 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
// autoload_real.php @generated by Composer
|
||||||
|
|
||||||
|
class ComposerAutoloaderInit873464e4bd965a3168f133248b1b218b
|
||||||
|
{
|
||||||
|
private static $loader;
|
||||||
|
|
||||||
|
public static function loadClassLoader($class)
|
||||||
|
{
|
||||||
|
if ('Composer\Autoload\ClassLoader' === $class) {
|
||||||
|
require __DIR__ . '/ClassLoader.php';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function getLoader()
|
||||||
|
{
|
||||||
|
if (null !== self::$loader) {
|
||||||
|
return self::$loader;
|
||||||
|
}
|
||||||
|
|
||||||
|
spl_autoload_register(array('ComposerAutoloaderInit873464e4bd965a3168f133248b1b218b', 'loadClassLoader'), true, true);
|
||||||
|
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
|
||||||
|
spl_autoload_unregister(array('ComposerAutoloaderInit873464e4bd965a3168f133248b1b218b', 'loadClassLoader'));
|
||||||
|
|
||||||
|
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
|
||||||
|
if ($useStaticLoader) {
|
||||||
|
require_once __DIR__ . '/autoload_static.php';
|
||||||
|
|
||||||
|
call_user_func(\Composer\Autoload\ComposerStaticInit873464e4bd965a3168f133248b1b218b::getInitializer($loader));
|
||||||
|
} else {
|
||||||
|
$map = require __DIR__ . '/autoload_namespaces.php';
|
||||||
|
foreach ($map as $namespace => $path) {
|
||||||
|
$loader->set($namespace, $path);
|
||||||
|
}
|
||||||
|
|
||||||
|
$map = require __DIR__ . '/autoload_psr4.php';
|
||||||
|
foreach ($map as $namespace => $path) {
|
||||||
|
$loader->setPsr4($namespace, $path);
|
||||||
|
}
|
||||||
|
|
||||||
|
$classMap = require __DIR__ . '/autoload_classmap.php';
|
||||||
|
if ($classMap) {
|
||||||
|
$loader->addClassMap($classMap);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$loader->register(true);
|
||||||
|
|
||||||
|
return $loader;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,40 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
// autoload_static.php @generated by Composer
|
||||||
|
|
||||||
|
namespace Composer\Autoload;
|
||||||
|
|
||||||
|
class ComposerStaticInit873464e4bd965a3168f133248b1b218b
|
||||||
|
{
|
||||||
|
public static $prefixLengthsPsr4 = array (
|
||||||
|
'R' =>
|
||||||
|
array (
|
||||||
|
'RobThree\\Auth\\' => 14,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
public static $prefixDirsPsr4 = array (
|
||||||
|
'RobThree\\Auth\\' =>
|
||||||
|
array (
|
||||||
|
0 => __DIR__ . '/..' . '/robthree/twofactorauth/lib',
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
public static $classMap = array (
|
||||||
|
'u2flib_server\\Error' => __DIR__ . '/..' . '/yubico/u2flib-server/src/u2flib_server/U2F.php',
|
||||||
|
'u2flib_server\\RegisterRequest' => __DIR__ . '/..' . '/yubico/u2flib-server/src/u2flib_server/U2F.php',
|
||||||
|
'u2flib_server\\Registration' => __DIR__ . '/..' . '/yubico/u2flib-server/src/u2flib_server/U2F.php',
|
||||||
|
'u2flib_server\\SignRequest' => __DIR__ . '/..' . '/yubico/u2flib-server/src/u2flib_server/U2F.php',
|
||||||
|
'u2flib_server\\U2F' => __DIR__ . '/..' . '/yubico/u2flib-server/src/u2flib_server/U2F.php',
|
||||||
|
);
|
||||||
|
|
||||||
|
public static function getInitializer(ClassLoader $loader)
|
||||||
|
{
|
||||||
|
return \Closure::bind(function () use ($loader) {
|
||||||
|
$loader->prefixLengthsPsr4 = ComposerStaticInit873464e4bd965a3168f133248b1b218b::$prefixLengthsPsr4;
|
||||||
|
$loader->prefixDirsPsr4 = ComposerStaticInit873464e4bd965a3168f133248b1b218b::$prefixDirsPsr4;
|
||||||
|
$loader->classMap = ComposerStaticInit873464e4bd965a3168f133248b1b218b::$classMap;
|
||||||
|
|
||||||
|
}, null, ClassLoader::class);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,88 @@
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"name": "robthree/twofactorauth",
|
||||||
|
"version": "1.6",
|
||||||
|
"version_normalized": "1.6.0.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/RobThree/TwoFactorAuth.git",
|
||||||
|
"reference": "5093ab230cd8f1296d792afb6a49545f37e7fd5a"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/RobThree/TwoFactorAuth/zipball/5093ab230cd8f1296d792afb6a49545f37e7fd5a",
|
||||||
|
"reference": "5093ab230cd8f1296d792afb6a49545f37e7fd5a",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "@stable"
|
||||||
|
},
|
||||||
|
"time": "2017-02-17T15:24:54+00:00",
|
||||||
|
"type": "library",
|
||||||
|
"installation-source": "dist",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"RobThree\\Auth\\": "lib"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Rob Janssen",
|
||||||
|
"homepage": "http://robiii.me",
|
||||||
|
"role": "Developer"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Two Factor Authentication",
|
||||||
|
"homepage": "https://github.com/RobThree/TwoFactorAuth",
|
||||||
|
"keywords": [
|
||||||
|
"Authentication",
|
||||||
|
"MFA",
|
||||||
|
"Multi Factor Authentication",
|
||||||
|
"Two Factor Authentication",
|
||||||
|
"authenticator",
|
||||||
|
"authy",
|
||||||
|
"php",
|
||||||
|
"tfa"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "yubico/u2flib-server",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"version_normalized": "1.0.0.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/Yubico/php-u2flib-server.git",
|
||||||
|
"reference": "407eb21da24150aad30bcd8cc0ee72963eac5e9d"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/Yubico/php-u2flib-server/zipball/407eb21da24150aad30bcd8cc0ee72963eac5e9d",
|
||||||
|
"reference": "407eb21da24150aad30bcd8cc0ee72963eac5e9d",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"ext-openssl": "*"
|
||||||
|
},
|
||||||
|
"time": "2016-02-19T09:47:51+00:00",
|
||||||
|
"type": "library",
|
||||||
|
"installation-source": "dist",
|
||||||
|
"autoload": {
|
||||||
|
"classmap": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"BSD-2-Clause"
|
||||||
|
],
|
||||||
|
"description": "Library for U2F implementation",
|
||||||
|
"homepage": "https://developers.yubico.com/php-u2flib-server"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
@ -0,0 +1,186 @@
|
||||||
|
## Ignore Visual Studio temporary files, build results, and
|
||||||
|
## files generated by popular Visual Studio add-ons.
|
||||||
|
|
||||||
|
# User-specific files
|
||||||
|
*.suo
|
||||||
|
*.user
|
||||||
|
*.sln.docstates
|
||||||
|
|
||||||
|
# Build results
|
||||||
|
[Dd]ebug/
|
||||||
|
[Dd]ebugPublic/
|
||||||
|
[Rr]elease/
|
||||||
|
[Rr]eleases/
|
||||||
|
x64/
|
||||||
|
x86/
|
||||||
|
build/
|
||||||
|
bld/
|
||||||
|
[Bb]in/
|
||||||
|
[Oo]bj/
|
||||||
|
|
||||||
|
# Roslyn cache directories
|
||||||
|
*.ide/
|
||||||
|
|
||||||
|
# MSTest test Results
|
||||||
|
[Tt]est[Rr]esult*/
|
||||||
|
[Bb]uild[Ll]og.*
|
||||||
|
|
||||||
|
#NUNIT
|
||||||
|
*.VisualState.xml
|
||||||
|
TestResult.xml
|
||||||
|
|
||||||
|
# Build Results of an ATL Project
|
||||||
|
[Dd]ebugPS/
|
||||||
|
[Rr]eleasePS/
|
||||||
|
dlldata.c
|
||||||
|
|
||||||
|
*_i.c
|
||||||
|
*_p.c
|
||||||
|
*_i.h
|
||||||
|
*.ilk
|
||||||
|
*.meta
|
||||||
|
*.obj
|
||||||
|
*.pch
|
||||||
|
*.pdb
|
||||||
|
*.pgc
|
||||||
|
*.pgd
|
||||||
|
*.rsp
|
||||||
|
*.sbr
|
||||||
|
*.tlb
|
||||||
|
*.tli
|
||||||
|
*.tlh
|
||||||
|
*.tmp
|
||||||
|
*.tmp_proj
|
||||||
|
*.log
|
||||||
|
*.vspscc
|
||||||
|
*.vssscc
|
||||||
|
.builds
|
||||||
|
*.pidb
|
||||||
|
*.svclog
|
||||||
|
*.scc
|
||||||
|
|
||||||
|
# Chutzpah Test files
|
||||||
|
_Chutzpah*
|
||||||
|
|
||||||
|
# Visual C++ cache files
|
||||||
|
ipch/
|
||||||
|
*.aps
|
||||||
|
*.ncb
|
||||||
|
*.opensdf
|
||||||
|
*.sdf
|
||||||
|
*.cachefile
|
||||||
|
|
||||||
|
# Visual Studio profiler
|
||||||
|
*.psess
|
||||||
|
*.vsp
|
||||||
|
*.vspx
|
||||||
|
|
||||||
|
# TFS 2012 Local Workspace
|
||||||
|
$tf/
|
||||||
|
|
||||||
|
# Guidance Automation Toolkit
|
||||||
|
*.gpState
|
||||||
|
|
||||||
|
# ReSharper is a .NET coding add-in
|
||||||
|
_ReSharper*/
|
||||||
|
*.[Rr]e[Ss]harper
|
||||||
|
*.DotSettings.user
|
||||||
|
|
||||||
|
# JustCode is a .NET coding addin-in
|
||||||
|
.JustCode
|
||||||
|
|
||||||
|
# TeamCity is a build add-in
|
||||||
|
_TeamCity*
|
||||||
|
|
||||||
|
# DotCover is a Code Coverage Tool
|
||||||
|
*.dotCover
|
||||||
|
|
||||||
|
# NCrunch
|
||||||
|
_NCrunch_*
|
||||||
|
.*crunch*.local.xml
|
||||||
|
|
||||||
|
# MightyMoose
|
||||||
|
*.mm.*
|
||||||
|
AutoTest.Net/
|
||||||
|
|
||||||
|
# Web workbench (sass)
|
||||||
|
.sass-cache/
|
||||||
|
|
||||||
|
# Installshield output folder
|
||||||
|
[Ee]xpress/
|
||||||
|
|
||||||
|
# DocProject is a documentation generator add-in
|
||||||
|
DocProject/buildhelp/
|
||||||
|
DocProject/Help/*.HxT
|
||||||
|
DocProject/Help/*.HxC
|
||||||
|
DocProject/Help/*.hhc
|
||||||
|
DocProject/Help/*.hhk
|
||||||
|
DocProject/Help/*.hhp
|
||||||
|
DocProject/Help/Html2
|
||||||
|
DocProject/Help/html
|
||||||
|
|
||||||
|
# Click-Once directory
|
||||||
|
publish/
|
||||||
|
|
||||||
|
# Publish Web Output
|
||||||
|
*.[Pp]ublish.xml
|
||||||
|
*.azurePubxml
|
||||||
|
# TODO: Comment the next line if you want to checkin your web deploy settings
|
||||||
|
# but database connection strings (with potential passwords) will be unencrypted
|
||||||
|
*.pubxml
|
||||||
|
*.publishproj
|
||||||
|
|
||||||
|
# NuGet Packages
|
||||||
|
*.nupkg
|
||||||
|
# The packages folder can be ignored because of Package Restore
|
||||||
|
**/packages/*
|
||||||
|
# except build/, which is used as an MSBuild target.
|
||||||
|
!**/packages/build/
|
||||||
|
# If using the old MSBuild-Integrated Package Restore, uncomment this:
|
||||||
|
#!**/packages/repositories.config
|
||||||
|
|
||||||
|
# Windows Azure Build Output
|
||||||
|
csx/
|
||||||
|
*.build.csdef
|
||||||
|
|
||||||
|
# Windows Store app package directory
|
||||||
|
AppPackages/
|
||||||
|
|
||||||
|
# Others
|
||||||
|
sql/
|
||||||
|
*.Cache
|
||||||
|
ClientBin/
|
||||||
|
[Ss]tyle[Cc]op.*
|
||||||
|
~$*
|
||||||
|
*~
|
||||||
|
*.dbmdl
|
||||||
|
*.dbproj.schemaview
|
||||||
|
*.pfx
|
||||||
|
*.publishsettings
|
||||||
|
node_modules/
|
||||||
|
|
||||||
|
# RIA/Silverlight projects
|
||||||
|
Generated_Code/
|
||||||
|
|
||||||
|
# Backup & report files from converting an old project file
|
||||||
|
# to a newer Visual Studio version. Backup files are not needed,
|
||||||
|
# because we have git ;-)
|
||||||
|
_UpgradeReport_Files/
|
||||||
|
Backup*/
|
||||||
|
UpgradeLog*.XML
|
||||||
|
UpgradeLog*.htm
|
||||||
|
|
||||||
|
# SQL Server files
|
||||||
|
*.mdf
|
||||||
|
*.ldf
|
||||||
|
|
||||||
|
# Business Intelligence projects
|
||||||
|
*.rdl.data
|
||||||
|
*.bim.layout
|
||||||
|
*.bim_*.settings
|
||||||
|
|
||||||
|
# Microsoft Fakes
|
||||||
|
FakesAssemblies/
|
||||||
|
|
||||||
|
# Composer
|
||||||
|
/vendor
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
language: php
|
||||||
|
|
||||||
|
php:
|
||||||
|
- 5.3
|
||||||
|
- 5.4
|
||||||
|
- 5.5
|
||||||
|
- 5.6
|
||||||
|
- 7
|
||||||
|
- hhvm
|
||||||
|
|
||||||
|
script: phpunit --coverage-text tests
|
||||||
1031
data/web/inc/lib/vendor/robthree/twofactorauth/.vs/config/applicationhost.config
vendored
100644
1031
data/web/inc/lib/vendor/robthree/twofactorauth/.vs/config/applicationhost.config
vendored
100644
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,22 @@
|
||||||
|
The MIT License (MIT)
|
||||||
|
|
||||||
|
Copyright (c) 2014-2015 Rob Janssen
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
|
||||||
|
|
@ -0,0 +1,197 @@
|
||||||
|
#  PHP library for Two Factor Authentication
|
||||||
|
|
||||||
|
[](https://travis-ci.org/RobThree/TwoFactorAuth/) [](https://packagist.org/packages/robthree/twofactorauth) [](LICENSE) [](https://packagist.org/packages/robthree/twofactorauth) [](http://hhvm.h4cc.de/package/robthree/twofactorauth) [](https://codeclimate.com/github/RobThree/TwoFactorAuth) [](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6MB5M2SQLP636 "Keep me off the streets")
|
||||||
|
|
||||||
|
PHP library for [two-factor (or multi-factor) authentication](http://en.wikipedia.org/wiki/Multi-factor_authentication) using [TOTP](http://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm) and [QR-codes](http://en.wikipedia.org/wiki/QR_code). Inspired by, based on but most importantly an *improvement* on '[PHPGangsta/GoogleAuthenticator](https://github.com/PHPGangsta/GoogleAuthenticator)'. There's a [.Net implementation](https://github.com/RobThree/TwoFactorAuth.Net) of this library as well.
|
||||||
|
|
||||||
|
<p align="center">
|
||||||
|
<img src="https://raw.githubusercontent.com/RobThree/TwoFactorAuth/master/multifactorauthforeveryone.png">
|
||||||
|
</p>
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
* Tested on PHP 5.3, 5.4, 5.5 and 5.6, 7 and HHVM
|
||||||
|
* [cURL](http://php.net/manual/en/book.curl.php) when using the provided `GoogleQRCodeProvider` (default), `QRServerProvider` or `QRicketProvider` but you can also provide your own QR-code provider.
|
||||||
|
* [random_bytes()](http://php.net/manual/en/function.random-bytes.php), [MCrypt](http://php.net/manual/en/book.mcrypt.php), [OpenSSL](http://php.net/manual/en/book.openssl.php) or [Hash](http://php.net/manual/en/book.hash.php) depending on which built-in RNG you use (TwoFactorAuth will try to 'autodetect' and use the best available); however: feel free to provide your own (CS)RNG.
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
|
||||||
|
Run the following command:
|
||||||
|
|
||||||
|
`php composer.phar require robthree/twofactorauth`
|
||||||
|
|
||||||
|
## Quick start
|
||||||
|
|
||||||
|
If you want to hit the ground running then have a look at the [demo](demo/demo.php). It's very simple and easy!
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
Here are some code snippets that should help you get started...
|
||||||
|
|
||||||
|
````php
|
||||||
|
// Create a TwoFactorAuth instance
|
||||||
|
$tfa = new RobThree\Auth\TwoFactorAuth('My Company');
|
||||||
|
````
|
||||||
|
|
||||||
|
The TwoFactorAuth class constructor accepts 7 parameters (all optional):
|
||||||
|
|
||||||
|
Parameter | Default value | Use
|
||||||
|
------------------|---------------|--------------------------------------------------
|
||||||
|
`$issuer` | `null` | Will be displayed in the app as issuer name
|
||||||
|
`$digits` | `6` | The number of digits the resulting codes will be
|
||||||
|
`$period` | `30` | The number of seconds a code will be valid
|
||||||
|
`$algorithm` | `sha1` | The algorithm used
|
||||||
|
`$qrcodeprovider` | `null` | QR-code provider (more on this later)
|
||||||
|
`$rngprovider` | `null` | Random Number Generator provider (more on this later)
|
||||||
|
`$timeprovider` | `null` | Time provider (more on this later)
|
||||||
|
|
||||||
|
These parameters are all '`write once`'; the class will, for it's lifetime, use these values when generating / calculating codes. The number of digits, the period and algorithm are all set to values Google's Authticator app uses (and supports). You may specify `8` digits, a period of `45` seconds and the `sha256` algorithm but the authenticator app (be it Google's implementation, Authy or any other app) may or may not support these values. Your mileage may vary; keep it on the safe side if you don't control which app your audience uses.
|
||||||
|
|
||||||
|
### Step 1: Set up secret shared key
|
||||||
|
|
||||||
|
When a user wants to setup two-factor auth (or, more correctly, multi-factor auth) you need to create a secret. This will be your **shared secret**. This secret will need to be entered by the user in their app. This can be done manually, in which case you simply display the secret and have the user type it in the app:
|
||||||
|
|
||||||
|
````php
|
||||||
|
$secret = $tfa->createSecret();
|
||||||
|
````
|
||||||
|
|
||||||
|
The `createSecret()` method accepts two arguments: `$bits` (default: `80`) and `$requirecryptosecure` (default: `true`). The former is the number of bits generated for the shared secret. Make sure this argument is a multiple of 8 and, again, keep in mind that not all combinations may be supported by all apps. Google authenticator seems happy with 80 and 160, the default is set to 80 because that's what most sites (that I know of) currently use; however a value of 160 or higher is recommended (see [RFC 4226 - Algorithm Requirements](https://tools.ietf.org/html/rfc4226#section-4)). The latter is used to ensure that the secret is cryptographically secure; if you don't care very much for cryptographically secure secrets you can specify `false` and use a **non**-cryptographically secure RNG provider.
|
||||||
|
|
||||||
|
````php
|
||||||
|
// Display shared secret
|
||||||
|
<p>Please enter the following code in your app: '<?php echo $secret; ?>'</p>
|
||||||
|
````
|
||||||
|
|
||||||
|
Another, more user-friendly, way to get the shared secret into the app is to generate a [QR-code](http://en.wikipedia.org/wiki/QR_code) which can be scanned by the app. To generate these QR codes you can use any one of the built-in `QRProvider` classes:
|
||||||
|
|
||||||
|
1. `GoogleQRCodeProvider` (default)
|
||||||
|
2. `QRServerProvider`
|
||||||
|
3. `QRicketProvider`
|
||||||
|
|
||||||
|
...or implement your own provider. To implement your own provider all you need to do is implement the `IQRCodeProvider` interface. You can use the built-in providers mentioned before to serve as an example or read the next chapter in this file. The built-in classes all use a 3rd (e.g. external) party (Google, QRServer and QRicket) for the hard work of generating QR-codes (note: each of these services might at some point not be available or impose limitations to the number of codes generated per day, hour etc.). You could, however, easily use a project like [PHP QR Code](http://phpqrcode.sourceforge.net/) (or one of the [many others](https://packagist.org/search/?q=qr)) to generate your QR-codes without depending on external sources. Later on we'll [demonstrate](#qr-code-providers) how to do this.
|
||||||
|
|
||||||
|
The built-in providers all have some provider-specific 'tweaks' you can 'apply'. Some provide support for different colors, others may let you specify the desired image-format etc. What they all have in common is that they return a QR-code as binary blob which, in turn, will be turned into a [data URI](http://en.wikipedia.org/wiki/Data_URI_scheme) by the `TwoFactorAuth` class. This makes it easy for you to display the image without requiring extra 'roundtrips' from browser to server and vice versa.
|
||||||
|
|
||||||
|
````php
|
||||||
|
// Display QR code to user
|
||||||
|
<p>Scan the following image with your app:</p>
|
||||||
|
<p><img src="<?php echo $tfa->getQRCodeImageAsDataUri('Bob Ross', $secret); ?>"></p>
|
||||||
|
````
|
||||||
|
|
||||||
|
When outputting a QR-code you can choose a `$label` for the user (which, when entering a shared secret manually, will have to be chosen by the user). This label may be an empty string or `null`. Also a `$size` may be specified (in pixels, width == height) for which we use a default value of `200`.
|
||||||
|
|
||||||
|
### Step 2: Verify secret shared key
|
||||||
|
|
||||||
|
When the shared secret is added to the app, the app will be ready to start generating codes which 'expire' each '`$period`' number of seconds. To make sure the secret was entered, or scanned, correctly you need to verify this by having the user enter a generated code. To check if the generated code is valid you call the `verifyCode()` method:
|
||||||
|
|
||||||
|
````php
|
||||||
|
// Verify code
|
||||||
|
$result = $tfa->verifyCode($_SESSION['secret'], $_POST['verification']);
|
||||||
|
````
|
||||||
|
|
||||||
|
`verifyCode()` will return either `true` (the code was valid) or `false` (the code was invalid; no points for you!). You may need to store `$secret` in a `$_SESSION` or other persistent storage between requests. The `verifyCode()` accepts, aside from `$secret` and `$code`, two more parameters. The first being `$discrepancy`. Since TOTP codes are based on time("slices") it is very important that the server (but also client) have a correct date/time. But because the two *may* differ a bit we usually allow a certain amount of leeway. Because generated codes are valid for a specific period (remember the `$period` parameter in the `TwoFactorAuth`'s constructor?) we usually check the period directly before and the period directly after the current time when validating codes. So when the current time is `14:34:21`, which results in a 'current timeslice' of `14:34:00` to `14:34:30` we also calculate/verify the codes for `14:33:30` to `14:34:00` and for `14:34:30` to `14:35:00`. This gives us a 'window' of `14:33:30` to `14:35:00`. The `$discrepancy` parameter specifies how many periods (or: timeslices) we check in either direction of the current time. The default `$discrepancy` of `1` results in (max.) 3 period checks: -1, current and +1 period. A `$discrepancy` of `4` would result in a larger window (or: bigger time difference between client and server) of -4, -3, -2, -1, current, +1, +2, +3 and +4 periods.
|
||||||
|
|
||||||
|
The second parameter `$time` allows you to check a code for a specific point in time. This parameter has no real practical use but can be handy for unittesting etc. The default value, `null`, means: use the current time.
|
||||||
|
|
||||||
|
### Step 3: Store `$secret` with user and we're done!
|
||||||
|
|
||||||
|
Ok, so now the code has been verified and found to be correct. Now we can store the `$secret` with our user in our database (or elsewhere) and whenever the user begins a new session we ask for a code generated by the authentication app of their choice. All we need to do is call `verifyCode()` again with the shared secret and the entered code and we know if the user is legit or not.
|
||||||
|
|
||||||
|
Simple as 1-2-3.
|
||||||
|
|
||||||
|
All we need is 3 methods and a constructor:
|
||||||
|
|
||||||
|
````php
|
||||||
|
public function __construct(
|
||||||
|
$issuer = null,
|
||||||
|
$digits = 6,
|
||||||
|
$period = 30,
|
||||||
|
$algorithm = 'sha1',
|
||||||
|
RobThree\Auth\Providers\Qr\IQRCodeProvider $qrcodeprovider = null,
|
||||||
|
RobThree\Auth\Providers\Rng\IRNGProvider $rngprovider = null
|
||||||
|
);
|
||||||
|
public function createSecret($bits = 80, $requirecryptosecure = true): string;
|
||||||
|
public function getQRCodeImageAsDataUri($label, $secret, $size = 200): string;
|
||||||
|
public function verifyCode($secret, $code, $discrepancy = 1, $time = null): bool;
|
||||||
|
````
|
||||||
|
|
||||||
|
### QR-code providers
|
||||||
|
|
||||||
|
As mentioned before, this library comes with three 'built-in' QR-code providers. This chapter will touch the subject a bit but most of it should be self-explanatory. The `TwoFactorAuth`-class accepts a `$qrcodeprovider` parameter which lets you specify a built-in or custom QR-code provider. All three built-in providers do a simple HTTP request to retrieve an image using cURL and implement the [`IQRCodeProvider`](lib/Providers/Qr/IQRCodeProvider.php) interface which is all you need to implement to write your own QR-code provider.
|
||||||
|
|
||||||
|
The default provider is the [`GoogleQRCodeProvider`](lib/Providers/Qr/GoogleQRCodeProvider.php) which uses the [Google Chart Tools](https://developers.google.com/chart/infographics/docs/qr_codes) to render QR-codes. Then we have the [`QRServerProvider`](lib/Providers/Qr/QRServerProvider.php) which uses the [goqr.me API](http://goqr.me/api/doc/create-qr-code/) and finally we have the [`QRicketProvider`](lib/Providers/Qr/QRicketProvider.php) which uses the [QRickit API](http://qrickit.com/qrickit_apps/qrickit_api.php). All three inherit from a common (abstract) baseclass named [`BaseHTTPQRCodeProvider`](lib/Providers/Qr/BaseHTTPQRCodeProvider.php) because all three share the same functionality: retrieve an image from a 3rd party over HTTP. All three classes have constructors that allow you to tweak some settings and most, if not all, arguments should speak for themselves. If you're not sure which values are supported, click the links in this paragraph for documentation on the API's that are utilized by these classes.
|
||||||
|
|
||||||
|
If you don't like any of the built-in classes because you don't want to rely on external resources for example or because you're paranoid about sending the TOTP secret to these 3rd parties (which is useless to them since they miss *at least one* other factor in the [MFA process](http://en.wikipedia.org/wiki/Multi-factor_authentication)), feel tree to implement your own. The `IQRCodeProvider` interface couldn't be any simpler. All you need to do is implement 2 methods:
|
||||||
|
|
||||||
|
````php
|
||||||
|
getMimeType();
|
||||||
|
getQRCodeImage($qrtext, $size);
|
||||||
|
````
|
||||||
|
|
||||||
|
The `getMimeType()` method should return the [MIME type](http://en.wikipedia.org/wiki/Internet_media_type) of the image that is returned by our implementation of `getQRCodeImage()`. In this example it's simply `image/png`. The `getQRCodeImage()` method is passed two arguments: `$qrtext` and `$size`. The latter, `$size`, is simply the width/height in pixels of the image desired by the caller. The first, `$qrtext` is the text that should be encoded in the QR-code. An example of such a text would be:
|
||||||
|
|
||||||
|
`otpauth://totp/LABEL:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=ISSUER`
|
||||||
|
|
||||||
|
All you need to do is return the QR-code as binary image data and you're done. All parts of the `$qrtext` have been escaped for you (but note: you *may* need to escape the entire `$qrtext` just once more when passing the data to another server as GET-parameter).
|
||||||
|
|
||||||
|
Let's see if we can use [PHP QR Code](http://phpqrcode.sourceforge.net/) to implement our own, custom, no-3rd-parties-allowed-here, provider. We start with downloading the [required (single) file](https://github.com/t0k4rt/phpqrcode/blob/master/phpqrcode.php) and putting it in the directory where `TwoFactorAuth.php` is located as well. Now let's implement the provider: create another file named `myprovider.php` in the `Providers\Qr` directory and paste in this content:
|
||||||
|
|
||||||
|
````php
|
||||||
|
<?php
|
||||||
|
require_once '../../phpqrcode.php'; // Yeah, we're gonna need that
|
||||||
|
|
||||||
|
namespace RobThree\Auth\Providers\Qr;
|
||||||
|
|
||||||
|
class MyProvider implements IQRCodeProvider {
|
||||||
|
public function getMimeType() {
|
||||||
|
return 'image/png'; // This provider only returns PNG's
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getQRCodeImage($qrtext, $size) {
|
||||||
|
ob_start(); // 'Catch' QRCode's output
|
||||||
|
QRCode::png($qrtext, null, QR_ECLEVEL_L, 3, 4); // We ignore $size and set it to 3
|
||||||
|
// since phpqrcode doesn't support
|
||||||
|
// a size in pixels...
|
||||||
|
$result = ob_get_contents(); // 'Catch' QRCode's output
|
||||||
|
ob_end_clean(); // Cleanup
|
||||||
|
return $result; // Return image
|
||||||
|
}
|
||||||
|
}
|
||||||
|
````
|
||||||
|
|
||||||
|
That's it. We're done! We've implemented our own provider (with help of PHP QR Code). No more external dependencies, no more unnecessary latencies. Now let's *use* our provider:
|
||||||
|
|
||||||
|
````php
|
||||||
|
<?php
|
||||||
|
$mp = new RobThree\Auth\Providers\Qr\MyProvider();
|
||||||
|
$tfa = new RobThree\Auth\TwoFactorAuth('My Company', 6, 30, 'sha1', $mp);
|
||||||
|
$secret = $tfa->createSecret();
|
||||||
|
?>
|
||||||
|
<p><img src="<?php echo $tfa->getQRCodeImageAsDataUri('Bob Ross', $secret); ?>"></p>
|
||||||
|
````
|
||||||
|
|
||||||
|
Voilà. Couldn't make it any simpler.
|
||||||
|
|
||||||
|
### RNG providers
|
||||||
|
|
||||||
|
This library also comes with three 'built-in' RNG providers ([Random Number Generator](https://en.wikipedia.org/wiki/Random_number_generation)). The RNG provider generates a number of random bytes and returns these bytes as a string. These values are then used to create the secret. By default (no RNG provider specified) TwoFactorAuth will try to determine the best available RNG provider to use. It will, by default, try to use the [`CSRNGProvider`](lib/Providers/Rng/CSRNGProvider.php) for PHP7+ or the [`MCryptRNGProvider`](lib/Providers/Rng/MCryptRNGProvider.php); if this is not available/supported for any reason it will try to use the [`OpenSSLRNGProvider`](lib/Providers/Rng/OpenSSLRNGProvider.php) and if that is also not available/supported it will try to use the final RNG provider: [`HashRNGProvider`](lib/Providers/Rng/HashRNGProvider.php). Each of these providers use their own method of generating a random sequence of bytes. The first three (`CSRNGProvider`, `OpenSSLRNGProvider` and `MCryptRNGProvider`) return a [cryptographically secure](https://en.wikipedia.org/wiki/Cryptographically_secure_pseudorandom_number_generator) sequence of random bytes whereas the `HashRNGProvider` returns a **non-cryptographically secure** sequence.
|
||||||
|
|
||||||
|
You can easily implement your own `RNGProvider` by simply implementing the `IRNGProvider` interface. Each of the 'built-in' RNG providers have some constructor parameters that allow you to 'tweak' some of the settings to use when creating the random bytes such as which source to use (`MCryptRNGProvider`) or which hashing algorithm (`HashRNGProvider`). I encourage you to have a look at some of the ['built-in' RNG providers](lib/Providers/Rng) for details and the [`IRNGProvider` interface](lib/Providers/Rng/IRNGProvider.php).
|
||||||
|
|
||||||
|
### Time providers
|
||||||
|
|
||||||
|
Another set of providers in this library are the Time Providers; this library provides three 'built-in' ones. The default Time Provider used is the [`LocalMachineTimeProvider`](lib/Providers/Time/LocalMachineTimeProvider.php); this provider simply returns the output of `Time()` and is *highly recommended* as default provider. The [`HttpTimeProvider`](lib/Providers/Time/HttpTimeProvider.php) executes a `HEAD` request against a given webserver (default: google.com) and tries to extract the `Date:`-HTTP header and returns it's date. Other url's/domains can be used by specifying the url in the constructor. The final Time Provider is the [`ConvertUnixTimeDotComTimeProvider`](lib/Providers/Time/ConvertUnixTimeDotComTimeProvider.php) which does a HTTP request to `convert-unix-time.com/api` and decodes the `JSON` result to retrieve the time.
|
||||||
|
|
||||||
|
You can easily implement your own `TimeProvider` by simply implementing the `ITimeProvider` interface.
|
||||||
|
|
||||||
|
As to *why* these Time Providers are implemented: it allows the TwoFactorAuth library to ensure the hosts time is correct (or rather: within a margin). You can use the `ensureCorrectTime()` method to ensure the hosts time is correct. By default this method will compare the hosts time (returned by calling `time()` on the `LocalMachineTimeProvider`) to Google's and convert-unix-time.com's current time. You can pass an array of `ITimeProvider`s and specify the `leniency` (second argument) allowed (default: 5 seconds). The method will throw when the TwoFactorAuth's timeprovider (which can be any `ITimeProvider`, see constructor) differs more than the given amount of seconds from any of the given `ITimeProviders`. We advise to call this method sparingly when relying on 3rd parties (which both the `HttpTimeProvider` and `ConvertUnixTimeDotComTimeProvider` do) or, if you need to ensure time is correct on a (very) regular basis to implement an `ITimeProvider` that is more efficient than the 'built-in' ones (like use a GPS signal). The `ensureCorrectTime()` method is mostly to be used to make sure the server is configured correctly.
|
||||||
|
|
||||||
|
## Integrations
|
||||||
|
|
||||||
|
- [CakePHP 3](https://github.com/andrej-griniuk/cakephp-two-factor-auth)
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
Licensed under MIT license. See [LICENSE](https://raw.githubusercontent.com/RobThree/TwoFactorAuth/master/LICENSE) for details.
|
||||||
|
|
||||||
|
[Logo / icon](http://www.iconmay.com/Simple/Travel_and_Tourism_Part_2/luggage_lock_safety_baggage_keys_cylinder_lock_hotel_travel_tourism_luggage_lock_icon_465) under CC0 1.0 Universal (CC0 1.0) Public Domain Dedication ([Archived page](http://riii.nl/tm7ap))
|
||||||
|
|
@ -0,0 +1,69 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||||
|
<Name>TwoFactorAuth</Name>
|
||||||
|
<ProjectGuid>{e569f53a-a604-4579-91ce-4e35b27da47b}</ProjectGuid>
|
||||||
|
<RootNamespace>TwoFactorAuth</RootNamespace>
|
||||||
|
<OutputType>Library</OutputType>
|
||||||
|
<ProjectTypeGuids>{A0786B88-2ADB-4C21-ABE8-AA2D79766269}</ProjectTypeGuids>
|
||||||
|
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
|
||||||
|
<Server>PHPDev</Server>
|
||||||
|
<PublishEvent>None</PublishEvent>
|
||||||
|
<PHPDevAutoPort>True</PHPDevAutoPort>
|
||||||
|
<PHPDevPort>41315</PHPDevPort>
|
||||||
|
<PHPDevHostName>localhost</PHPDevHostName>
|
||||||
|
<IISProjectUrl>http://localhost:41315/</IISProjectUrl>
|
||||||
|
<Runtime>PHP</Runtime>
|
||||||
|
<RuntimeVersion>7.0</RuntimeVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||||
|
<IncludeDebugInformation>true</IncludeDebugInformation>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<IncludeDebugInformation>false</IncludeDebugInformation>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="demo\demo.php" />
|
||||||
|
<Compile Include="demo\loader.php" />
|
||||||
|
<Compile Include="lib\Providers\Qr\BaseHTTPQRCodeProvider.php" />
|
||||||
|
<Compile Include="lib\Providers\Qr\GoogleQRCodeProvider.php" />
|
||||||
|
<Compile Include="lib\Providers\Qr\IQRCodeProvider.php" />
|
||||||
|
<Compile Include="lib\Providers\Qr\QRException.php" />
|
||||||
|
<Compile Include="lib\Providers\Qr\QRicketProvider.php" />
|
||||||
|
<Compile Include="lib\Providers\Qr\QRServerProvider.php" />
|
||||||
|
<Compile Include="lib\Providers\Rng\CSRNGProvider.php" />
|
||||||
|
<Compile Include="lib\Providers\Rng\IRNGProvider.php" />
|
||||||
|
<Compile Include="lib\Providers\Rng\MCryptRNGProvider.php" />
|
||||||
|
<Compile Include="lib\Providers\Rng\OpenSSLRNGProvider.php" />
|
||||||
|
<Compile Include="lib\Providers\Rng\HashRNGProvider.php" />
|
||||||
|
<Compile Include="lib\Providers\Rng\RNGException.php" />
|
||||||
|
<Compile Include="lib\Providers\Time\ConvertUnixTimeDotComTimeProvider.php" />
|
||||||
|
<Compile Include="lib\Providers\Time\HttpTimeProvider.php" />
|
||||||
|
<Compile Include="lib\Providers\Time\ITimeProvider.php" />
|
||||||
|
<Compile Include="lib\Providers\Time\LocalMachineTimeProvider.php" />
|
||||||
|
<Compile Include="lib\Providers\Time\TimeException.php" />
|
||||||
|
<Compile Include="lib\TwoFactorAuth.php" />
|
||||||
|
<Compile Include=".gitignore" />
|
||||||
|
<Compile Include="README.md" />
|
||||||
|
<Compile Include="lib\TwoFactorAuthException.php" />
|
||||||
|
<Compile Include="tests\TwoFactorAuthTest.php" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Folder Include="lib\" />
|
||||||
|
<Folder Include="lib\Providers\" />
|
||||||
|
<Folder Include="lib\Providers\Time\" />
|
||||||
|
<Folder Include="lib\Providers\Qr\" />
|
||||||
|
<Folder Include="lib\Providers\Rng\" />
|
||||||
|
<Folder Include="demo\" />
|
||||||
|
<Folder Include="tests\" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Content Include=".travis.yml" />
|
||||||
|
<Content Include="composer.json" />
|
||||||
|
<Content Include="composer.lock" />
|
||||||
|
<Content Include="logo.png" />
|
||||||
|
<Content Include="multifactorauthforeveryone.png" />
|
||||||
|
<Content Include="LICENSE" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
|
||||||
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
|
# Visual Studio 2013
|
||||||
|
VisualStudioVersion = 12.0.30723.0
|
||||||
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
|
Project("{A0786B88-2ADB-4C21-ABE8-AA2D79766269}") = "TwoFactorAuth", "TwoFactorAuth.phpproj", "{E569F53A-A604-4579-91CE-4E35B27DA47B}"
|
||||||
|
EndProject
|
||||||
|
Global
|
||||||
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
Release|Any CPU = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{E569F53A-A604-4579-91CE-4E35B27DA47B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{E569F53A-A604-4579-91CE-4E35B27DA47B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{E569F53A-A604-4579-91CE-4E35B27DA47B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{E569F53A-A604-4579-91CE-4E35B27DA47B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
|
HideSolutionNode = FALSE
|
||||||
|
EndGlobalSection
|
||||||
|
EndGlobal
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
{
|
||||||
|
"name": "robthree/twofactorauth",
|
||||||
|
"description": "Two Factor Authentication",
|
||||||
|
"version": "1.6",
|
||||||
|
"type": "library",
|
||||||
|
"keywords": [ "Authentication", "Two Factor Authentication", "Multi Factor Authentication", "TFA", "MFA", "PHP", "Authenticator", "Authy" ],
|
||||||
|
"homepage": "https://github.com/RobThree/TwoFactorAuth",
|
||||||
|
"license": "MIT",
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Rob Janssen",
|
||||||
|
"homepage": "http://robiii.me",
|
||||||
|
"role": "Developer"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"support": {
|
||||||
|
"issues": "https://github.com/RobThree/TwoFactorAuth/issues",
|
||||||
|
"source": "https://github.com/RobThree/TwoFactorAuth"
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "@stable"
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"RobThree\\Auth\\": "lib"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload-dev": {
|
||||||
|
"psr-4": {
|
||||||
|
"RobThree\\Auth\\Test\\": "tests"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,980 @@
|
||||||
|
{
|
||||||
|
"_readme": [
|
||||||
|
"This file locks the dependencies of your project to a known state",
|
||||||
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||||
|
"This file is @generated automatically"
|
||||||
|
],
|
||||||
|
"content-hash": "9647de85f54ba6db237f5ff42ff85a1f",
|
||||||
|
"packages": [],
|
||||||
|
"packages-dev": [
|
||||||
|
{
|
||||||
|
"name": "doctrine/instantiator",
|
||||||
|
"version": "1.0.5",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/doctrine/instantiator.git",
|
||||||
|
"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
|
||||||
|
"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3,<8.0-DEV"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"athletic/athletic": "~0.1.8",
|
||||||
|
"ext-pdo": "*",
|
||||||
|
"ext-phar": "*",
|
||||||
|
"phpunit/phpunit": "~4.0",
|
||||||
|
"squizlabs/php_codesniffer": "~2.0"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "1.0.x-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Marco Pivetta",
|
||||||
|
"email": "ocramius@gmail.com",
|
||||||
|
"homepage": "http://ocramius.github.com/"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
|
||||||
|
"homepage": "https://github.com/doctrine/instantiator",
|
||||||
|
"keywords": [
|
||||||
|
"constructor",
|
||||||
|
"instantiate"
|
||||||
|
],
|
||||||
|
"time": "2015-06-14T21:17:01+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "phpdocumentor/reflection-docblock",
|
||||||
|
"version": "2.0.4",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
|
||||||
|
"reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
|
||||||
|
"reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3.3"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "~4.0"
|
||||||
|
},
|
||||||
|
"suggest": {
|
||||||
|
"dflydev/markdown": "~1.0",
|
||||||
|
"erusev/parsedown": "~1.0"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "2.0.x-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-0": {
|
||||||
|
"phpDocumentor": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Mike van Riel",
|
||||||
|
"email": "mike.vanriel@naenius.com"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"time": "2015-02-03T12:10:50+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "phpspec/prophecy",
|
||||||
|
"version": "v1.6.2",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/phpspec/prophecy.git",
|
||||||
|
"reference": "6c52c2722f8460122f96f86346600e1077ce22cb"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/6c52c2722f8460122f96f86346600e1077ce22cb",
|
||||||
|
"reference": "6c52c2722f8460122f96f86346600e1077ce22cb",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"doctrine/instantiator": "^1.0.2",
|
||||||
|
"php": "^5.3|^7.0",
|
||||||
|
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
|
||||||
|
"sebastian/comparator": "^1.1",
|
||||||
|
"sebastian/recursion-context": "^1.0|^2.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpspec/phpspec": "^2.0",
|
||||||
|
"phpunit/phpunit": "^4.8 || ^5.6.5"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "1.6.x-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-0": {
|
||||||
|
"Prophecy\\": "src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Konstantin Kudryashov",
|
||||||
|
"email": "ever.zet@gmail.com",
|
||||||
|
"homepage": "http://everzet.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Marcello Duarte",
|
||||||
|
"email": "marcello.duarte@gmail.com"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Highly opinionated mocking framework for PHP 5.3+",
|
||||||
|
"homepage": "https://github.com/phpspec/prophecy",
|
||||||
|
"keywords": [
|
||||||
|
"Double",
|
||||||
|
"Dummy",
|
||||||
|
"fake",
|
||||||
|
"mock",
|
||||||
|
"spy",
|
||||||
|
"stub"
|
||||||
|
],
|
||||||
|
"time": "2016-11-21T14:58:47+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "phpunit/php-code-coverage",
|
||||||
|
"version": "2.2.4",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
|
||||||
|
"reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
|
||||||
|
"reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3.3",
|
||||||
|
"phpunit/php-file-iterator": "~1.3",
|
||||||
|
"phpunit/php-text-template": "~1.2",
|
||||||
|
"phpunit/php-token-stream": "~1.3",
|
||||||
|
"sebastian/environment": "^1.3.2",
|
||||||
|
"sebastian/version": "~1.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"ext-xdebug": ">=2.1.4",
|
||||||
|
"phpunit/phpunit": "~4"
|
||||||
|
},
|
||||||
|
"suggest": {
|
||||||
|
"ext-dom": "*",
|
||||||
|
"ext-xdebug": ">=2.2.1",
|
||||||
|
"ext-xmlwriter": "*"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "2.2.x-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"classmap": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"BSD-3-Clause"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Sebastian Bergmann",
|
||||||
|
"email": "sb@sebastian-bergmann.de",
|
||||||
|
"role": "lead"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
|
||||||
|
"homepage": "https://github.com/sebastianbergmann/php-code-coverage",
|
||||||
|
"keywords": [
|
||||||
|
"coverage",
|
||||||
|
"testing",
|
||||||
|
"xunit"
|
||||||
|
],
|
||||||
|
"time": "2015-10-06T15:47:00+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "phpunit/php-file-iterator",
|
||||||
|
"version": "1.4.2",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
|
||||||
|
"reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
|
||||||
|
"reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3.3"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "1.4.x-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"classmap": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"BSD-3-Clause"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Sebastian Bergmann",
|
||||||
|
"email": "sb@sebastian-bergmann.de",
|
||||||
|
"role": "lead"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "FilterIterator implementation that filters files based on a list of suffixes.",
|
||||||
|
"homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
|
||||||
|
"keywords": [
|
||||||
|
"filesystem",
|
||||||
|
"iterator"
|
||||||
|
],
|
||||||
|
"time": "2016-10-03T07:40:28+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "phpunit/php-text-template",
|
||||||
|
"version": "1.2.1",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/sebastianbergmann/php-text-template.git",
|
||||||
|
"reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
|
||||||
|
"reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3.3"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"classmap": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"BSD-3-Clause"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Sebastian Bergmann",
|
||||||
|
"email": "sebastian@phpunit.de",
|
||||||
|
"role": "lead"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Simple template engine.",
|
||||||
|
"homepage": "https://github.com/sebastianbergmann/php-text-template/",
|
||||||
|
"keywords": [
|
||||||
|
"template"
|
||||||
|
],
|
||||||
|
"time": "2015-06-21T13:50:34+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "phpunit/php-timer",
|
||||||
|
"version": "1.0.8",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/sebastianbergmann/php-timer.git",
|
||||||
|
"reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
|
||||||
|
"reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3.3"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "~4|~5"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"classmap": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"BSD-3-Clause"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Sebastian Bergmann",
|
||||||
|
"email": "sb@sebastian-bergmann.de",
|
||||||
|
"role": "lead"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Utility class for timing",
|
||||||
|
"homepage": "https://github.com/sebastianbergmann/php-timer/",
|
||||||
|
"keywords": [
|
||||||
|
"timer"
|
||||||
|
],
|
||||||
|
"time": "2016-05-12T18:03:57+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "phpunit/php-token-stream",
|
||||||
|
"version": "1.4.9",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
|
||||||
|
"reference": "3b402f65a4cc90abf6e1104e388b896ce209631b"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3b402f65a4cc90abf6e1104e388b896ce209631b",
|
||||||
|
"reference": "3b402f65a4cc90abf6e1104e388b896ce209631b",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"ext-tokenizer": "*",
|
||||||
|
"php": ">=5.3.3"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "~4.2"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "1.4-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"classmap": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"BSD-3-Clause"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Sebastian Bergmann",
|
||||||
|
"email": "sebastian@phpunit.de"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Wrapper around PHP's tokenizer extension.",
|
||||||
|
"homepage": "https://github.com/sebastianbergmann/php-token-stream/",
|
||||||
|
"keywords": [
|
||||||
|
"tokenizer"
|
||||||
|
],
|
||||||
|
"time": "2016-11-15T14:06:22+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "phpunit/phpunit",
|
||||||
|
"version": "4.8.35",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||||
|
"reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/791b1a67c25af50e230f841ee7a9c6eba507dc87",
|
||||||
|
"reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"ext-dom": "*",
|
||||||
|
"ext-json": "*",
|
||||||
|
"ext-pcre": "*",
|
||||||
|
"ext-reflection": "*",
|
||||||
|
"ext-spl": "*",
|
||||||
|
"php": ">=5.3.3",
|
||||||
|
"phpspec/prophecy": "^1.3.1",
|
||||||
|
"phpunit/php-code-coverage": "~2.1",
|
||||||
|
"phpunit/php-file-iterator": "~1.4",
|
||||||
|
"phpunit/php-text-template": "~1.2",
|
||||||
|
"phpunit/php-timer": "^1.0.6",
|
||||||
|
"phpunit/phpunit-mock-objects": "~2.3",
|
||||||
|
"sebastian/comparator": "~1.2.2",
|
||||||
|
"sebastian/diff": "~1.2",
|
||||||
|
"sebastian/environment": "~1.3",
|
||||||
|
"sebastian/exporter": "~1.2",
|
||||||
|
"sebastian/global-state": "~1.0",
|
||||||
|
"sebastian/version": "~1.0",
|
||||||
|
"symfony/yaml": "~2.1|~3.0"
|
||||||
|
},
|
||||||
|
"suggest": {
|
||||||
|
"phpunit/php-invoker": "~1.1"
|
||||||
|
},
|
||||||
|
"bin": [
|
||||||
|
"phpunit"
|
||||||
|
],
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "4.8.x-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"classmap": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"BSD-3-Clause"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Sebastian Bergmann",
|
||||||
|
"email": "sebastian@phpunit.de",
|
||||||
|
"role": "lead"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "The PHP Unit Testing framework.",
|
||||||
|
"homepage": "https://phpunit.de/",
|
||||||
|
"keywords": [
|
||||||
|
"phpunit",
|
||||||
|
"testing",
|
||||||
|
"xunit"
|
||||||
|
],
|
||||||
|
"time": "2017-02-06T05:18:07+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "phpunit/phpunit-mock-objects",
|
||||||
|
"version": "2.3.8",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
|
||||||
|
"reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
|
||||||
|
"reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"doctrine/instantiator": "^1.0.2",
|
||||||
|
"php": ">=5.3.3",
|
||||||
|
"phpunit/php-text-template": "~1.2",
|
||||||
|
"sebastian/exporter": "~1.2"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "~4.4"
|
||||||
|
},
|
||||||
|
"suggest": {
|
||||||
|
"ext-soap": "*"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "2.3.x-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"classmap": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"BSD-3-Clause"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Sebastian Bergmann",
|
||||||
|
"email": "sb@sebastian-bergmann.de",
|
||||||
|
"role": "lead"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Mock Object library for PHPUnit",
|
||||||
|
"homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
|
||||||
|
"keywords": [
|
||||||
|
"mock",
|
||||||
|
"xunit"
|
||||||
|
],
|
||||||
|
"time": "2015-10-02T06:51:40+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "sebastian/comparator",
|
||||||
|
"version": "1.2.4",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/sebastianbergmann/comparator.git",
|
||||||
|
"reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
|
||||||
|
"reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3.3",
|
||||||
|
"sebastian/diff": "~1.2",
|
||||||
|
"sebastian/exporter": "~1.2 || ~2.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "~4.4"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "1.2.x-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"classmap": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"BSD-3-Clause"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Jeff Welch",
|
||||||
|
"email": "whatthejeff@gmail.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Volker Dusch",
|
||||||
|
"email": "github@wallbash.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Bernhard Schussek",
|
||||||
|
"email": "bschussek@2bepublished.at"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Sebastian Bergmann",
|
||||||
|
"email": "sebastian@phpunit.de"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Provides the functionality to compare PHP values for equality",
|
||||||
|
"homepage": "http://www.github.com/sebastianbergmann/comparator",
|
||||||
|
"keywords": [
|
||||||
|
"comparator",
|
||||||
|
"compare",
|
||||||
|
"equality"
|
||||||
|
],
|
||||||
|
"time": "2017-01-29T09:50:25+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "sebastian/diff",
|
||||||
|
"version": "1.4.1",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/sebastianbergmann/diff.git",
|
||||||
|
"reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
|
||||||
|
"reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3.3"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "~4.8"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "1.4-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"classmap": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"BSD-3-Clause"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Kore Nordmann",
|
||||||
|
"email": "mail@kore-nordmann.de"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Sebastian Bergmann",
|
||||||
|
"email": "sebastian@phpunit.de"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Diff implementation",
|
||||||
|
"homepage": "https://github.com/sebastianbergmann/diff",
|
||||||
|
"keywords": [
|
||||||
|
"diff"
|
||||||
|
],
|
||||||
|
"time": "2015-12-08T07:14:41+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "sebastian/environment",
|
||||||
|
"version": "1.3.8",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/sebastianbergmann/environment.git",
|
||||||
|
"reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
|
||||||
|
"reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": "^5.3.3 || ^7.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "^4.8 || ^5.0"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "1.3.x-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"classmap": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"BSD-3-Clause"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Sebastian Bergmann",
|
||||||
|
"email": "sebastian@phpunit.de"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Provides functionality to handle HHVM/PHP environments",
|
||||||
|
"homepage": "http://www.github.com/sebastianbergmann/environment",
|
||||||
|
"keywords": [
|
||||||
|
"Xdebug",
|
||||||
|
"environment",
|
||||||
|
"hhvm"
|
||||||
|
],
|
||||||
|
"time": "2016-08-18T05:49:44+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "sebastian/exporter",
|
||||||
|
"version": "1.2.2",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/sebastianbergmann/exporter.git",
|
||||||
|
"reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
|
||||||
|
"reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3.3",
|
||||||
|
"sebastian/recursion-context": "~1.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"ext-mbstring": "*",
|
||||||
|
"phpunit/phpunit": "~4.4"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "1.3.x-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"classmap": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"BSD-3-Clause"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Jeff Welch",
|
||||||
|
"email": "whatthejeff@gmail.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Volker Dusch",
|
||||||
|
"email": "github@wallbash.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Bernhard Schussek",
|
||||||
|
"email": "bschussek@2bepublished.at"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Sebastian Bergmann",
|
||||||
|
"email": "sebastian@phpunit.de"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Adam Harvey",
|
||||||
|
"email": "aharvey@php.net"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Provides the functionality to export PHP variables for visualization",
|
||||||
|
"homepage": "http://www.github.com/sebastianbergmann/exporter",
|
||||||
|
"keywords": [
|
||||||
|
"export",
|
||||||
|
"exporter"
|
||||||
|
],
|
||||||
|
"time": "2016-06-17T09:04:28+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "sebastian/global-state",
|
||||||
|
"version": "1.1.1",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/sebastianbergmann/global-state.git",
|
||||||
|
"reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
|
||||||
|
"reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3.3"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "~4.2"
|
||||||
|
},
|
||||||
|
"suggest": {
|
||||||
|
"ext-uopz": "*"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "1.0-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"classmap": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"BSD-3-Clause"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Sebastian Bergmann",
|
||||||
|
"email": "sebastian@phpunit.de"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Snapshotting of global state",
|
||||||
|
"homepage": "http://www.github.com/sebastianbergmann/global-state",
|
||||||
|
"keywords": [
|
||||||
|
"global state"
|
||||||
|
],
|
||||||
|
"time": "2015-10-12T03:26:01+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "sebastian/recursion-context",
|
||||||
|
"version": "1.0.2",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/sebastianbergmann/recursion-context.git",
|
||||||
|
"reference": "913401df809e99e4f47b27cdd781f4a258d58791"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
|
||||||
|
"reference": "913401df809e99e4f47b27cdd781f4a258d58791",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3.3"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "~4.4"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "1.0.x-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"classmap": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"BSD-3-Clause"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Jeff Welch",
|
||||||
|
"email": "whatthejeff@gmail.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Sebastian Bergmann",
|
||||||
|
"email": "sebastian@phpunit.de"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Adam Harvey",
|
||||||
|
"email": "aharvey@php.net"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Provides functionality to recursively process PHP variables",
|
||||||
|
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
|
||||||
|
"time": "2015-11-11T19:50:13+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "sebastian/version",
|
||||||
|
"version": "1.0.6",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/sebastianbergmann/version.git",
|
||||||
|
"reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
|
||||||
|
"reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"classmap": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"BSD-3-Clause"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Sebastian Bergmann",
|
||||||
|
"email": "sebastian@phpunit.de",
|
||||||
|
"role": "lead"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
|
||||||
|
"homepage": "https://github.com/sebastianbergmann/version",
|
||||||
|
"time": "2015-06-21T13:59:46+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "symfony/yaml",
|
||||||
|
"version": "v2.8.17",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/symfony/yaml.git",
|
||||||
|
"reference": "322a8c2dfbca15ad6b1b27e182899f98ec0e0153"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/symfony/yaml/zipball/322a8c2dfbca15ad6b1b27e182899f98ec0e0153",
|
||||||
|
"reference": "322a8c2dfbca15ad6b1b27e182899f98ec0e0153",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=5.3.9"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "2.8-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Symfony\\Component\\Yaml\\": ""
|
||||||
|
},
|
||||||
|
"exclude-from-classmap": [
|
||||||
|
"/Tests/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Fabien Potencier",
|
||||||
|
"email": "fabien@symfony.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Symfony Community",
|
||||||
|
"homepage": "https://symfony.com/contributors"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Symfony Yaml Component",
|
||||||
|
"homepage": "https://symfony.com",
|
||||||
|
"time": "2017-01-21T16:40:50+00:00"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"aliases": [],
|
||||||
|
"minimum-stability": "stable",
|
||||||
|
"stability-flags": {
|
||||||
|
"phpunit/phpunit": 0
|
||||||
|
},
|
||||||
|
"prefer-stable": false,
|
||||||
|
"prefer-lowest": false,
|
||||||
|
"platform": {
|
||||||
|
"php": ">=5.3.0"
|
||||||
|
},
|
||||||
|
"platform-dev": []
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,35 @@
|
||||||
|
<!doctype html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>Demo</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<ol>
|
||||||
|
<?php
|
||||||
|
require_once 'loader.php';
|
||||||
|
Loader::register('../lib','RobThree\\Auth');
|
||||||
|
|
||||||
|
use \RobThree\Auth\TwoFactorAuth;
|
||||||
|
|
||||||
|
$tfa = new TwoFactorAuth('MyApp');
|
||||||
|
|
||||||
|
echo '<li>First create a secret and associate it with a user';
|
||||||
|
$secret = $tfa->createSecret(160); // Though the default is an 80 bits secret (for backwards compatibility reasons) we recommend creating 160+ bits secrets (see RFC 4226 - Algorithm Requirements)
|
||||||
|
echo '<li>Next create a QR code and let the user scan it:<br><img src="' . $tfa->getQRCodeImageAsDataUri('My label', $secret) . '"><br>...or display the secret to the user for manual entry: ' . chunk_split($secret, 4, ' ');
|
||||||
|
$code = $tfa->getCode($secret);
|
||||||
|
echo '<li>Next, have the user verify the code; at this time the code displayed by a 2FA-app would be: <span style="color:#00c">' . $code . '</span> (but that changes periodically)';
|
||||||
|
echo '<li>When the code checks out, 2FA can be / is enabled; store (encrypted?) secret with user and have the user verify a code each time a new session is started.';
|
||||||
|
echo '<li>When aforementioned code (' . $code . ') was entered, the result would be: ' . (($tfa->verifyCode($secret, $code) === true) ? '<span style="color:#0c0">OK</span>' : '<span style="color:#c00">FAIL</span>');
|
||||||
|
?>
|
||||||
|
</ol>
|
||||||
|
<p>Note: Make sure your server-time is <a href="http://en.wikipedia.org/wiki/Network_Time_Protocol">NTP-synced</a>! Depending on the $discrepancy allowed your time cannot drift too much from the users' time!</p>
|
||||||
|
<?php
|
||||||
|
try {
|
||||||
|
$tfa->ensureCorrectTime();
|
||||||
|
echo 'Your hosts time seems to be correct / within margin';
|
||||||
|
} catch (RobThree\Auth\TwoFactorAuthException $ex) {
|
||||||
|
echo '<b>Warning:</b> Your hosts time seems to be off: ' . $ex->getMessage();
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
@ -0,0 +1,50 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
//http://www.leaseweblabs.com/2014/04/psr-0-psr-4-autoloading-classes-php/
|
||||||
|
class Loader
|
||||||
|
{
|
||||||
|
protected static $parentPath = null;
|
||||||
|
protected static $paths = null;
|
||||||
|
protected static $files = null;
|
||||||
|
protected static $nsChar = '\\';
|
||||||
|
protected static $initialized = false;
|
||||||
|
|
||||||
|
protected static function initialize()
|
||||||
|
{
|
||||||
|
if (static::$initialized) return;
|
||||||
|
static::$initialized = true;
|
||||||
|
static::$parentPath = __FILE__;
|
||||||
|
for ($i=substr_count(get_class(), static::$nsChar);$i>=0;$i--) {
|
||||||
|
static::$parentPath = dirname(static::$parentPath);
|
||||||
|
}
|
||||||
|
static::$paths = array();
|
||||||
|
static::$files = array(__FILE__);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function register($path,$namespace) {
|
||||||
|
if (!static::$initialized) static::initialize();
|
||||||
|
static::$paths[$namespace] = trim($path,DIRECTORY_SEPARATOR);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function load($class) {
|
||||||
|
if (class_exists($class,false)) return;
|
||||||
|
if (!static::$initialized) static::initialize();
|
||||||
|
|
||||||
|
foreach (static::$paths as $namespace => $path) {
|
||||||
|
if (!$namespace || $namespace.static::$nsChar === substr($class, 0, strlen($namespace.static::$nsChar))) {
|
||||||
|
|
||||||
|
$fileName = substr($class,strlen($namespace.static::$nsChar)-1);
|
||||||
|
$fileName = str_replace(static::$nsChar, DIRECTORY_SEPARATOR, ltrim($fileName,static::$nsChar));
|
||||||
|
$fileName = static::$parentPath.DIRECTORY_SEPARATOR.$path.DIRECTORY_SEPARATOR.$fileName.'.php';
|
||||||
|
|
||||||
|
if (file_exists($fileName)) {
|
||||||
|
include $fileName;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
spl_autoload_register(array('Loader', 'load'));
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace RobThree\Auth\Providers\Qr;
|
||||||
|
|
||||||
|
abstract class BaseHTTPQRCodeProvider implements IQRCodeProvider
|
||||||
|
{
|
||||||
|
protected $verifyssl;
|
||||||
|
|
||||||
|
protected function getContent($url)
|
||||||
|
{
|
||||||
|
$curlhandle = curl_init();
|
||||||
|
|
||||||
|
curl_setopt_array($curlhandle, array(
|
||||||
|
CURLOPT_URL => $url,
|
||||||
|
CURLOPT_RETURNTRANSFER => true,
|
||||||
|
CURLOPT_CONNECTTIMEOUT => 10,
|
||||||
|
CURLOPT_DNS_CACHE_TIMEOUT => 10,
|
||||||
|
CURLOPT_TIMEOUT => 10,
|
||||||
|
CURLOPT_SSL_VERIFYPEER => $this->verifyssl,
|
||||||
|
CURLOPT_USERAGENT => 'TwoFactorAuth'
|
||||||
|
));
|
||||||
|
$data = curl_exec($curlhandle);
|
||||||
|
|
||||||
|
curl_close($curlhandle);
|
||||||
|
return $data;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,39 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace RobThree\Auth\Providers\Qr;
|
||||||
|
|
||||||
|
// https://developers.google.com/chart/infographics/docs/qr_codes
|
||||||
|
class GoogleQRCodeProvider extends BaseHTTPQRCodeProvider
|
||||||
|
{
|
||||||
|
public $errorcorrectionlevel;
|
||||||
|
public $margin;
|
||||||
|
|
||||||
|
function __construct($verifyssl = false, $errorcorrectionlevel = 'L', $margin = 1)
|
||||||
|
{
|
||||||
|
if (!is_bool($verifyssl))
|
||||||
|
throw new \QRException('VerifySSL must be bool');
|
||||||
|
|
||||||
|
$this->verifyssl = $verifyssl;
|
||||||
|
|
||||||
|
$this->errorcorrectionlevel = $errorcorrectionlevel;
|
||||||
|
$this->margin = $margin;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getMimeType()
|
||||||
|
{
|
||||||
|
return 'image/png';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getQRCodeImage($qrtext, $size)
|
||||||
|
{
|
||||||
|
return $this->getContent($this->getUrl($qrtext, $size));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getUrl($qrtext, $size)
|
||||||
|
{
|
||||||
|
return 'https://chart.googleapis.com/chart?cht=qr'
|
||||||
|
. '&chs=' . $size . 'x' . $size
|
||||||
|
. '&chld=' . $this->errorcorrectionlevel . '|' . $this->margin
|
||||||
|
. '&chl=' . rawurlencode($qrtext);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace RobThree\Auth\Providers\Qr;
|
||||||
|
|
||||||
|
interface IQRCodeProvider
|
||||||
|
{
|
||||||
|
public function getQRCodeImage($qrtext, $size);
|
||||||
|
public function getMimeType();
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use RobThree\Auth\TwoFactorAuthException;
|
||||||
|
|
||||||
|
class QRException extends TwoFactorAuthException {}
|
||||||
|
|
@ -0,0 +1,71 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace RobThree\Auth\Providers\Qr;
|
||||||
|
|
||||||
|
// http://goqr.me/api/doc/create-qr-code/
|
||||||
|
class QRServerProvider extends BaseHTTPQRCodeProvider
|
||||||
|
{
|
||||||
|
public $errorcorrectionlevel;
|
||||||
|
public $margin;
|
||||||
|
public $qzone;
|
||||||
|
public $bgcolor;
|
||||||
|
public $color;
|
||||||
|
public $format;
|
||||||
|
|
||||||
|
function __construct($verifyssl = false, $errorcorrectionlevel = 'L', $margin = 4, $qzone = 1, $bgcolor = 'ffffff', $color = '000000', $format = 'png')
|
||||||
|
{
|
||||||
|
if (!is_bool($verifyssl))
|
||||||
|
throw new QRException('VerifySSL must be bool');
|
||||||
|
|
||||||
|
$this->verifyssl = $verifyssl;
|
||||||
|
|
||||||
|
$this->errorcorrectionlevel = $errorcorrectionlevel;
|
||||||
|
$this->margin = $margin;
|
||||||
|
$this->qzone = $qzone;
|
||||||
|
$this->bgcolor = $bgcolor;
|
||||||
|
$this->color = $color;
|
||||||
|
$this->format = $format;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getMimeType()
|
||||||
|
{
|
||||||
|
switch (strtolower($this->format))
|
||||||
|
{
|
||||||
|
case 'png':
|
||||||
|
return 'image/png';
|
||||||
|
case 'gif':
|
||||||
|
return 'image/gif';
|
||||||
|
case 'jpg':
|
||||||
|
case 'jpeg':
|
||||||
|
return 'image/jpeg';
|
||||||
|
case 'svg':
|
||||||
|
return 'image/svg+xml';
|
||||||
|
case 'eps':
|
||||||
|
return 'application/postscript';
|
||||||
|
}
|
||||||
|
throw new \QRException(sprintf('Unknown MIME-type: %s', $this->format));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getQRCodeImage($qrtext, $size)
|
||||||
|
{
|
||||||
|
return $this->getContent($this->getUrl($qrtext, $size));
|
||||||
|
}
|
||||||
|
|
||||||
|
private function decodeColor($value)
|
||||||
|
{
|
||||||
|
return vsprintf('%d-%d-%d', sscanf($value, "%02x%02x%02x"));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getUrl($qrtext, $size)
|
||||||
|
{
|
||||||
|
return 'https://api.qrserver.com/v1/create-qr-code/'
|
||||||
|
. '?size=' . $size . 'x' . $size
|
||||||
|
. '&ecc=' . strtoupper($this->errorcorrectionlevel)
|
||||||
|
. '&margin=' . $this->margin
|
||||||
|
. '&qzone=' . $this->qzone
|
||||||
|
. '&bgcolor=' . $this->decodeColor($this->bgcolor)
|
||||||
|
. '&color=' . $this->decodeColor($this->color)
|
||||||
|
. '&format=' . strtolower($this->format)
|
||||||
|
. '&data=' . rawurlencode($qrtext);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,54 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace RobThree\Auth\Providers\Qr;
|
||||||
|
|
||||||
|
// http://qrickit.com/qrickit_apps/qrickit_api.php
|
||||||
|
class QRicketProvider extends BaseHTTPQRCodeProvider
|
||||||
|
{
|
||||||
|
public $errorcorrectionlevel;
|
||||||
|
public $margin;
|
||||||
|
public $qzone;
|
||||||
|
public $bgcolor;
|
||||||
|
public $color;
|
||||||
|
public $format;
|
||||||
|
|
||||||
|
function __construct($errorcorrectionlevel = 'L', $bgcolor = 'ffffff', $color = '000000', $format = 'p')
|
||||||
|
{
|
||||||
|
$this->verifyssl = false;
|
||||||
|
|
||||||
|
$this->errorcorrectionlevel = $errorcorrectionlevel;
|
||||||
|
$this->bgcolor = $bgcolor;
|
||||||
|
$this->color = $color;
|
||||||
|
$this->format = $format;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getMimeType()
|
||||||
|
{
|
||||||
|
switch (strtolower($this->format))
|
||||||
|
{
|
||||||
|
case 'p':
|
||||||
|
return 'image/png';
|
||||||
|
case 'g':
|
||||||
|
return 'image/gif';
|
||||||
|
case 'j':
|
||||||
|
return 'image/jpeg';
|
||||||
|
}
|
||||||
|
throw new \QRException(sprintf('Unknown MIME-type: %s', $this->format));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getQRCodeImage($qrtext, $size)
|
||||||
|
{
|
||||||
|
return $this->getContent($this->getUrl($qrtext, $size));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getUrl($qrtext, $size)
|
||||||
|
{
|
||||||
|
return 'http://qrickit.com/api/qr'
|
||||||
|
. '?qrsize=' . $size
|
||||||
|
. '&e=' . strtolower($this->errorcorrectionlevel)
|
||||||
|
. '&bgdcolor=' . $this->bgcolor
|
||||||
|
. '&fgdcolor=' . $this->color
|
||||||
|
. '&t=' . strtolower($this->format)
|
||||||
|
. '&d=' . rawurlencode($qrtext);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace RobThree\Auth\Providers\Rng;
|
||||||
|
|
||||||
|
class CSRNGProvider implements IRNGProvider
|
||||||
|
{
|
||||||
|
public function getRandomBytes($bytecount) {
|
||||||
|
return random_bytes($bytecount); // PHP7+
|
||||||
|
}
|
||||||
|
|
||||||
|
public function isCryptographicallySecure() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
<?php
|
||||||
|
namespace RobThree\Auth\Providers\Rng;
|
||||||
|
|
||||||
|
class HashRNGProvider implements IRNGProvider
|
||||||
|
{
|
||||||
|
private $algorithm;
|
||||||
|
|
||||||
|
function __construct($algorithm = 'sha256' ) {
|
||||||
|
$algos = array_values(hash_algos());
|
||||||
|
if (!in_array($algorithm, $algos, true))
|
||||||
|
throw new \RNGException('Unsupported algorithm specified');
|
||||||
|
$this->algorithm = $algorithm;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getRandomBytes($bytecount) {
|
||||||
|
$result = '';
|
||||||
|
$hash = mt_rand();
|
||||||
|
for ($i = 0; $i < $bytecount; $i++) {
|
||||||
|
$hash = hash($this->algorithm, $hash.mt_rand(), true);
|
||||||
|
$result .= $hash[mt_rand(0, sizeof($hash))];
|
||||||
|
}
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function isCryptographicallySecure() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace RobThree\Auth\Providers\Rng;
|
||||||
|
|
||||||
|
interface IRNGProvider
|
||||||
|
{
|
||||||
|
public function getRandomBytes($bytecount);
|
||||||
|
public function isCryptographicallySecure();
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace RobThree\Auth\Providers\Rng;
|
||||||
|
|
||||||
|
class MCryptRNGProvider implements IRNGProvider
|
||||||
|
{
|
||||||
|
private $source;
|
||||||
|
|
||||||
|
function __construct($source = MCRYPT_DEV_URANDOM) {
|
||||||
|
$this->source = $source;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getRandomBytes($bytecount) {
|
||||||
|
$result = mcrypt_create_iv($bytecount, $this->source);
|
||||||
|
if ($result === false)
|
||||||
|
throw new \RNGException('mcrypt_create_iv returned an invalid value');
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function isCryptographicallySecure() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace RobThree\Auth\Providers\Rng;
|
||||||
|
|
||||||
|
class OpenSSLRNGProvider implements IRNGProvider
|
||||||
|
{
|
||||||
|
private $requirestrong;
|
||||||
|
|
||||||
|
function __construct($requirestrong = true) {
|
||||||
|
$this->requirestrong = $requirestrong;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getRandomBytes($bytecount) {
|
||||||
|
$result = openssl_random_pseudo_bytes($bytecount, $crypto_strong);
|
||||||
|
if ($this->requirestrong && ($crypto_strong === false))
|
||||||
|
throw new \RNGException('openssl_random_pseudo_bytes returned non-cryptographically strong value');
|
||||||
|
if ($result === false)
|
||||||
|
throw new \RNGException('openssl_random_pseudo_bytes returned an invalid value');
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function isCryptographicallySecure() {
|
||||||
|
return $this->requirestrong;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use RobThree\Auth\TwoFactorAuthException;
|
||||||
|
|
||||||
|
class RNGException extends TwoFactorAuthException {}
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace RobThree\Auth\Providers\Time;
|
||||||
|
|
||||||
|
class ConvertUnixTimeDotComTimeProvider implements ITimeProvider
|
||||||
|
{
|
||||||
|
public function getTime() {
|
||||||
|
$json = @json_decode(
|
||||||
|
@file_get_contents('http://www.convert-unix-time.com/api?timestamp=now')
|
||||||
|
);
|
||||||
|
if ($json === null || !is_int($json->timestamp))
|
||||||
|
throw new \TimeException('Unable to retrieve time from convert-unix-time.com');
|
||||||
|
return $json->timestamp;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,53 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace RobThree\Auth\Providers\Time;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Takes the time from any webserver by doing a HEAD request on the specified URL and extracting the 'Date:' header
|
||||||
|
*/
|
||||||
|
class HttpTimeProvider implements ITimeProvider
|
||||||
|
{
|
||||||
|
public $url;
|
||||||
|
public $options;
|
||||||
|
public $expectedtimeformat;
|
||||||
|
|
||||||
|
function __construct($url = 'https://google.com', $expectedtimeformat = 'D, d M Y H:i:s O+', array $options = null)
|
||||||
|
{
|
||||||
|
$this->url = $url;
|
||||||
|
$this->expectedtimeformat = $expectedtimeformat;
|
||||||
|
$this->options = $options;
|
||||||
|
if ($this->options === null) {
|
||||||
|
$this->options = array(
|
||||||
|
'http' => array(
|
||||||
|
'method' => 'HEAD',
|
||||||
|
'follow_location' => false,
|
||||||
|
'ignore_errors' => true,
|
||||||
|
'max_redirects' => 0,
|
||||||
|
'request_fulluri' => true,
|
||||||
|
'header' => array(
|
||||||
|
'Connection: close',
|
||||||
|
'User-agent: TwoFactorAuth HttpTimeProvider (https://github.com/RobThree/TwoFactorAuth)'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getTime() {
|
||||||
|
try {
|
||||||
|
$context = stream_context_create($this->options);
|
||||||
|
$fd = fopen($this->url, 'rb', false, $context);
|
||||||
|
$headers = stream_get_meta_data($fd);
|
||||||
|
fclose($fd);
|
||||||
|
|
||||||
|
foreach ($headers['wrapper_data'] as $h) {
|
||||||
|
if (strcasecmp(substr($h, 0, 5), 'Date:') === 0)
|
||||||
|
return \DateTime::createFromFormat($this->expectedtimeformat, trim(substr($h,5)))->getTimestamp();
|
||||||
|
}
|
||||||
|
throw new \TimeException(sprintf('Unable to retrieve time from %s (Invalid or no "Date:" header found)', $this->url));
|
||||||
|
}
|
||||||
|
catch (Exception $ex) {
|
||||||
|
throw new \TimeException(sprintf('Unable to retrieve time from %s (%s)', $this->url, $ex->getMessage()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace RobThree\Auth\Providers\Time;
|
||||||
|
|
||||||
|
interface ITimeProvider
|
||||||
|
{
|
||||||
|
public function getTime();
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace RobThree\Auth\Providers\Time;
|
||||||
|
|
||||||
|
class LocalMachineTimeProvider implements ITimeProvider {
|
||||||
|
public function getTime() {
|
||||||
|
return time();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use RobThree\Auth\TwoFactorAuthException;
|
||||||
|
|
||||||
|
class TimeException extends TwoFactorAuthException {}
|
||||||
|
|
@ -0,0 +1,249 @@
|
||||||
|
<?php
|
||||||
|
namespace RobThree\Auth;
|
||||||
|
|
||||||
|
use RobThree\Auth\Providers\Qr\IQRCodeProvider;
|
||||||
|
use RobThree\Auth\Providers\Rng\IRNGProvider;
|
||||||
|
use RobThree\Auth\Providers\Time\ITimeProvider;
|
||||||
|
|
||||||
|
// Based on / inspired by: https://github.com/PHPGangsta/GoogleAuthenticator
|
||||||
|
// Algorithms, digits, period etc. explained: https://github.com/google/google-authenticator/wiki/Key-Uri-Format
|
||||||
|
class TwoFactorAuth
|
||||||
|
{
|
||||||
|
private $algorithm;
|
||||||
|
private $period;
|
||||||
|
private $digits;
|
||||||
|
private $issuer;
|
||||||
|
private $qrcodeprovider = null;
|
||||||
|
private $rngprovider = null;
|
||||||
|
private $timeprovider = null;
|
||||||
|
private static $_base32dict = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567=';
|
||||||
|
private static $_base32;
|
||||||
|
private static $_base32lookup = array();
|
||||||
|
private static $_supportedalgos = array('sha1', 'sha256', 'sha512', 'md5');
|
||||||
|
|
||||||
|
function __construct($issuer = null, $digits = 6, $period = 30, $algorithm = 'sha1', IQRCodeProvider $qrcodeprovider = null, IRNGProvider $rngprovider = null, ITimeProvider $timeprovider = null)
|
||||||
|
{
|
||||||
|
$this->issuer = $issuer;
|
||||||
|
if (!is_int($digits) || $digits <= 0)
|
||||||
|
throw new TwoFactorAuthException('Digits must be int > 0');
|
||||||
|
$this->digits = $digits;
|
||||||
|
|
||||||
|
if (!is_int($period) || $period <= 0)
|
||||||
|
throw new TwoFactorAuthException('Period must be int > 0');
|
||||||
|
$this->period = $period;
|
||||||
|
|
||||||
|
$algorithm = strtolower(trim($algorithm));
|
||||||
|
if (!in_array($algorithm, self::$_supportedalgos))
|
||||||
|
throw new TwoFactorAuthException('Unsupported algorithm: ' . $algorithm);
|
||||||
|
$this->algorithm = $algorithm;
|
||||||
|
$this->qrcodeprovider = $qrcodeprovider;
|
||||||
|
$this->rngprovider = $rngprovider;
|
||||||
|
$this->timeprovider = $timeprovider;
|
||||||
|
|
||||||
|
self::$_base32 = str_split(self::$_base32dict);
|
||||||
|
self::$_base32lookup = array_flip(self::$_base32);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new secret
|
||||||
|
*/
|
||||||
|
public function createSecret($bits = 80, $requirecryptosecure = true)
|
||||||
|
{
|
||||||
|
$secret = '';
|
||||||
|
$bytes = ceil($bits / 5); //We use 5 bits of each byte (since we have a 32-character 'alphabet' / BASE32)
|
||||||
|
$rngprovider = $this->getRngprovider();
|
||||||
|
if ($requirecryptosecure && !$rngprovider->isCryptographicallySecure())
|
||||||
|
throw new TwoFactorAuthException('RNG provider is not cryptographically secure');
|
||||||
|
$rnd = $rngprovider->getRandomBytes($bytes);
|
||||||
|
for ($i = 0; $i < $bytes; $i++)
|
||||||
|
$secret .= self::$_base32[ord($rnd[$i]) & 31]; //Mask out left 3 bits for 0-31 values
|
||||||
|
return $secret;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculate the code with given secret and point in time
|
||||||
|
*/
|
||||||
|
public function getCode($secret, $time = null)
|
||||||
|
{
|
||||||
|
$secretkey = $this->base32Decode($secret);
|
||||||
|
|
||||||
|
$timestamp = "\0\0\0\0" . pack('N*', $this->getTimeSlice($this->getTime($time))); // Pack time into binary string
|
||||||
|
$hashhmac = hash_hmac($this->algorithm, $timestamp, $secretkey, true); // Hash it with users secret key
|
||||||
|
$hashpart = substr($hashhmac, ord(substr($hashhmac, -1)) & 0x0F, 4); // Use last nibble of result as index/offset and grab 4 bytes of the result
|
||||||
|
$value = unpack('N', $hashpart); // Unpack binary value
|
||||||
|
$value = $value[1] & 0x7FFFFFFF; // Drop MSB, keep only 31 bits
|
||||||
|
|
||||||
|
return str_pad($value % pow(10, $this->digits), $this->digits, '0', STR_PAD_LEFT);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if the code is correct. This will accept codes starting from ($discrepancy * $period) sec ago to ($discrepancy * period) sec from now
|
||||||
|
*/
|
||||||
|
public function verifyCode($secret, $code, $discrepancy = 1, $time = null)
|
||||||
|
{
|
||||||
|
$result = false;
|
||||||
|
$timetamp = $this->getTime($time);
|
||||||
|
|
||||||
|
// To keep safe from timing-attachs we iterate *all* possible codes even though we already may have verified a code is correct
|
||||||
|
for ($i = -$discrepancy; $i <= $discrepancy; $i++)
|
||||||
|
$result |= $this->codeEquals($this->getCode($secret, $timetamp + ($i * $this->period)), $code);
|
||||||
|
|
||||||
|
return (bool)$result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Timing-attack safe comparison of 2 codes (see http://blog.ircmaxell.com/2014/11/its-all-about-time.html)
|
||||||
|
*/
|
||||||
|
private function codeEquals($safe, $user) {
|
||||||
|
if (function_exists('hash_equals')) {
|
||||||
|
return hash_equals($safe, $user);
|
||||||
|
}
|
||||||
|
// In general, it's not possible to prevent length leaks. So it's OK to leak the length. The important part is that
|
||||||
|
// we don't leak information about the difference of the two strings.
|
||||||
|
if (strlen($safe)===strlen($user)) {
|
||||||
|
$result = 0;
|
||||||
|
for ($i = 0; $i < strlen($safe); $i++)
|
||||||
|
$result |= (ord($safe[$i]) ^ ord($user[$i]));
|
||||||
|
return $result === 0;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get data-uri of QRCode
|
||||||
|
*/
|
||||||
|
public function getQRCodeImageAsDataUri($label, $secret, $size = 200)
|
||||||
|
{
|
||||||
|
if (!is_int($size) || $size <= 0)
|
||||||
|
throw new TwoFactorAuthException('Size must be int > 0');
|
||||||
|
|
||||||
|
$qrcodeprovider = $this->getQrCodeProvider();
|
||||||
|
return 'data:'
|
||||||
|
. $qrcodeprovider->getMimeType()
|
||||||
|
. ';base64,'
|
||||||
|
. base64_encode($qrcodeprovider->getQRCodeImage($this->getQRText($label, $secret), $size));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Compare default timeprovider with specified timeproviders and ensure the time is within the specified number of seconds (leniency)
|
||||||
|
*/
|
||||||
|
public function ensureCorrectTime(array $timeproviders = null, $leniency = 5)
|
||||||
|
{
|
||||||
|
if ($timeproviders != null && !is_array($timeproviders))
|
||||||
|
throw new TwoFactorAuthException('No timeproviders specified');
|
||||||
|
|
||||||
|
if ($timeproviders == null)
|
||||||
|
$timeproviders = array(
|
||||||
|
new Providers\Time\ConvertUnixTimeDotComTimeProvider(),
|
||||||
|
new Providers\Time\HttpTimeProvider()
|
||||||
|
);
|
||||||
|
|
||||||
|
// Get default time provider
|
||||||
|
$timeprovider = $this->getTimeProvider();
|
||||||
|
|
||||||
|
// Iterate specified time providers
|
||||||
|
foreach ($timeproviders as $t) {
|
||||||
|
if (!($t instanceof ITimeProvider))
|
||||||
|
throw new TwoFactorAuthException('Object does not implement ITimeProvider');
|
||||||
|
|
||||||
|
// Get time from default time provider and compare to specific time provider and throw if time difference is more than specified number of seconds leniency
|
||||||
|
if (abs($timeprovider->getTime() - $t->getTime()) > $leniency)
|
||||||
|
throw new TwoFactorAuthException(sprintf('Time for timeprovider is off by more than %d seconds when compared to %s', $leniency, get_class($t)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getTime($time)
|
||||||
|
{
|
||||||
|
return ($time === null) ? $this->getTimeProvider()->getTime() : $time;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getTimeSlice($time = null, $offset = 0)
|
||||||
|
{
|
||||||
|
return (int)floor($time / $this->period) + ($offset * $this->period);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Builds a string to be encoded in a QR code
|
||||||
|
*/
|
||||||
|
public function getQRText($label, $secret)
|
||||||
|
{
|
||||||
|
return 'otpauth://totp/' . rawurlencode($label)
|
||||||
|
. '?secret=' . rawurlencode($secret)
|
||||||
|
. '&issuer=' . rawurlencode($this->issuer)
|
||||||
|
. '&period=' . intval($this->period)
|
||||||
|
. '&algorithm=' . rawurlencode(strtoupper($this->algorithm))
|
||||||
|
. '&digits=' . intval($this->digits);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function base32Decode($value)
|
||||||
|
{
|
||||||
|
if (strlen($value)==0) return '';
|
||||||
|
|
||||||
|
if (preg_match('/[^'.preg_quote(self::$_base32dict).']/', $value) !== 0)
|
||||||
|
throw new TwoFactorAuthException('Invalid base32 string');
|
||||||
|
|
||||||
|
$buffer = '';
|
||||||
|
foreach (str_split($value) as $char)
|
||||||
|
{
|
||||||
|
if ($char !== '=')
|
||||||
|
$buffer .= str_pad(decbin(self::$_base32lookup[$char]), 5, 0, STR_PAD_LEFT);
|
||||||
|
}
|
||||||
|
$length = strlen($buffer);
|
||||||
|
$blocks = trim(chunk_split(substr($buffer, 0, $length - ($length % 8)), 8, ' '));
|
||||||
|
|
||||||
|
$output = '';
|
||||||
|
foreach (explode(' ', $blocks) as $block)
|
||||||
|
$output .= chr(bindec(str_pad($block, 8, 0, STR_PAD_RIGHT)));
|
||||||
|
return $output;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return IQRCodeProvider
|
||||||
|
* @throws TwoFactorAuthException
|
||||||
|
*/
|
||||||
|
public function getQrCodeProvider()
|
||||||
|
{
|
||||||
|
// Set default QR Code provider if none was specified
|
||||||
|
if (null === $this->qrcodeprovider) {
|
||||||
|
return $this->qrcodeprovider = new Providers\Qr\GoogleQRCodeProvider();
|
||||||
|
}
|
||||||
|
return $this->qrcodeprovider;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return IRNGProvider
|
||||||
|
* @throws TwoFactorAuthException
|
||||||
|
*/
|
||||||
|
public function getRngprovider()
|
||||||
|
{
|
||||||
|
if (null !== $this->rngprovider) {
|
||||||
|
return $this->rngprovider;
|
||||||
|
}
|
||||||
|
if (function_exists('random_bytes')) {
|
||||||
|
return $this->rngprovider = new Providers\Rng\CSRNGProvider();
|
||||||
|
}
|
||||||
|
if (function_exists('mcrypt_create_iv')) {
|
||||||
|
return $this->rngprovider = new Providers\Rng\MCryptRNGProvider();
|
||||||
|
}
|
||||||
|
if (function_exists('openssl_random_pseudo_bytes')) {
|
||||||
|
return $this->rngprovider = new Providers\Rng\OpenSSLRNGProvider();
|
||||||
|
}
|
||||||
|
if (function_exists('hash')) {
|
||||||
|
return $this->rngprovider = new Providers\Rng\HashRNGProvider();
|
||||||
|
}
|
||||||
|
throw new TwoFactorAuthException('Unable to find a suited RNGProvider');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return ITimeProvider
|
||||||
|
* @throws TwoFactorAuthException
|
||||||
|
*/
|
||||||
|
public function getTimeProvider()
|
||||||
|
{
|
||||||
|
// Set default time provider if none was specified
|
||||||
|
if (null === $this->timeprovider) {
|
||||||
|
return $this->timeprovider = new Providers\Time\LocalMachineTimeProvider();
|
||||||
|
}
|
||||||
|
return $this->timeprovider;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace RobThree\Auth;
|
||||||
|
|
||||||
|
use Exception;
|
||||||
|
|
||||||
|
class TwoFactorAuthException extends \Exception {}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
|
|
@ -0,0 +1,381 @@
|
||||||
|
<?php
|
||||||
|
require_once 'lib/TwoFactorAuth.php';
|
||||||
|
require_once 'lib/TwoFactorAuthException.php';
|
||||||
|
|
||||||
|
require_once 'lib/Providers/Qr/IQRCodeProvider.php';
|
||||||
|
require_once 'lib/Providers/Qr/BaseHTTPQRCodeProvider.php';
|
||||||
|
require_once 'lib/Providers/Qr/GoogleQRCodeProvider.php';
|
||||||
|
require_once 'lib/Providers/Qr/QRException.php';
|
||||||
|
|
||||||
|
require_once 'lib/Providers/Rng/IRNGProvider.php';
|
||||||
|
require_once 'lib/Providers/Rng/RNGException.php';
|
||||||
|
require_once 'lib/Providers/Rng/CSRNGProvider.php';
|
||||||
|
require_once 'lib/Providers/Rng/MCryptRNGProvider.php';
|
||||||
|
require_once 'lib/Providers/Rng/OpenSSLRNGProvider.php';
|
||||||
|
require_once 'lib/Providers/Rng/HashRNGProvider.php';
|
||||||
|
require_once 'lib/Providers/Rng/RNGException.php';
|
||||||
|
|
||||||
|
require_once 'lib/Providers/Time/ITimeProvider.php';
|
||||||
|
require_once 'lib/Providers/Time/LocalMachineTimeProvider.php';
|
||||||
|
require_once 'lib/Providers/Time/HttpTimeProvider.php';
|
||||||
|
require_once 'lib/Providers/Time/ConvertUnixTimeDotComTimeProvider.php';
|
||||||
|
require_once 'lib/Providers/Time/TimeException.php';
|
||||||
|
|
||||||
|
use RobThree\Auth\TwoFactorAuth;
|
||||||
|
use RobThree\Auth\Providers\Qr\IQRCodeProvider;
|
||||||
|
use RobThree\Auth\Providers\Rng\IRNGProvider;
|
||||||
|
use RobThree\Auth\Providers\Time\ITimeProvider;
|
||||||
|
|
||||||
|
|
||||||
|
class TwoFactorAuthTest extends PHPUnit_Framework_TestCase
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @expectedException \RobThree\Auth\TwoFactorAuthException
|
||||||
|
*/
|
||||||
|
public function testConstructorThrowsOnInvalidDigits() {
|
||||||
|
|
||||||
|
new TwoFactorAuth('Test', 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \RobThree\Auth\TwoFactorAuthException
|
||||||
|
*/
|
||||||
|
public function testConstructorThrowsOnInvalidPeriod() {
|
||||||
|
|
||||||
|
new TwoFactorAuth('Test', 6, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \RobThree\Auth\TwoFactorAuthException
|
||||||
|
*/
|
||||||
|
public function testConstructorThrowsOnInvalidAlgorithm() {
|
||||||
|
|
||||||
|
new TwoFactorAuth('Test', 6, 30, 'xxx');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetCodeReturnsCorrectResults() {
|
||||||
|
|
||||||
|
$tfa = new TwoFactorAuth('Test');
|
||||||
|
$this->assertEquals('543160', $tfa->getCode('VMR466AB62ZBOKHE', 1426847216));
|
||||||
|
$this->assertEquals('538532', $tfa->getCode('VMR466AB62ZBOKHE', 0));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \RobThree\Auth\TwoFactorAuthException
|
||||||
|
*/
|
||||||
|
public function testCreateSecretThrowsOnInsecureRNGProvider() {
|
||||||
|
$rng = new TestRNGProvider();
|
||||||
|
|
||||||
|
$tfa = new TwoFactorAuth('Test', 6, 30, 'sha1', null, $rng);
|
||||||
|
$tfa->createSecret();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCreateSecretOverrideSecureDoesNotThrowOnInsecureRNG() {
|
||||||
|
$rng = new TestRNGProvider();
|
||||||
|
|
||||||
|
$tfa = new TwoFactorAuth('Test', 6, 30, 'sha1', null, $rng);
|
||||||
|
$this->assertEquals('ABCDEFGHIJKLMNOP', $tfa->createSecret(80, false));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCreateSecretDoesNotThrowOnSecureRNGProvider() {
|
||||||
|
$rng = new TestRNGProvider(true);
|
||||||
|
|
||||||
|
$tfa = new TwoFactorAuth('Test', 6, 30, 'sha1', null, $rng);
|
||||||
|
$this->assertEquals('ABCDEFGHIJKLMNOP', $tfa->createSecret());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCreateSecretGeneratesDesiredAmountOfEntropy() {
|
||||||
|
$rng = new TestRNGProvider(true);
|
||||||
|
|
||||||
|
$tfa = new TwoFactorAuth('Test', 6, 30, 'sha1', null, $rng);
|
||||||
|
$this->assertEquals('A', $tfa->createSecret(5));
|
||||||
|
$this->assertEquals('AB', $tfa->createSecret(6));
|
||||||
|
$this->assertEquals('ABCDEFGHIJKLMNOPQRSTUVWXYZ', $tfa->createSecret(128));
|
||||||
|
$this->assertEquals('ABCDEFGHIJKLMNOPQRSTUVWXYZ234567', $tfa->createSecret(160));
|
||||||
|
$this->assertEquals('ABCDEFGHIJKLMNOPQRSTUVWXYZ234567ABCDEFGHIJKLMNOPQRSTUVWXYZ234567', $tfa->createSecret(320));
|
||||||
|
$this->assertEquals('ABCDEFGHIJKLMNOPQRSTUVWXYZ234567ABCDEFGHIJKLMNOPQRSTUVWXYZ234567A', $tfa->createSecret(321));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testEnsureCorrectTimeDoesNotThrowForCorrectTime() {
|
||||||
|
$tpr1 = new TestTimeProvider(123);
|
||||||
|
$tpr2 = new TestTimeProvider(128);
|
||||||
|
|
||||||
|
$tfa = new TwoFactorAuth('Test', 6, 30, 'sha1', null, null, $tpr1);
|
||||||
|
$tfa->ensureCorrectTime(array($tpr2)); // 128 - 123 = 5 => within default leniency
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \RobThree\Auth\TwoFactorAuthException
|
||||||
|
*/
|
||||||
|
public function testEnsureCorrectTimeThrowsOnIncorrectTime() {
|
||||||
|
$tpr1 = new TestTimeProvider(123);
|
||||||
|
$tpr2 = new TestTimeProvider(124);
|
||||||
|
|
||||||
|
$tfa = new TwoFactorAuth('Test', 6, 30, 'sha1', null, null, $tpr1);
|
||||||
|
$tfa->ensureCorrectTime(array($tpr2), 0); // We force a leniency of 0, 124-123 = 1 so this should throw
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public function testEnsureDefaultTimeProviderReturnsCorrectTime() {
|
||||||
|
$tfa = new TwoFactorAuth('Test', 6, 30, 'sha1');
|
||||||
|
$tfa->ensureCorrectTime(array(new TestTimeProvider(time())), 1); // Use a leniency of 1, should the time change between both time() calls
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testEnsureAllTimeProvidersReturnCorrectTime() {
|
||||||
|
$tfa = new TwoFactorAuth('Test', 6, 30, 'sha1');
|
||||||
|
$tfa->ensureCorrectTime(array(
|
||||||
|
new RobThree\Auth\Providers\Time\ConvertUnixTimeDotComTimeProvider(),
|
||||||
|
new RobThree\Auth\Providers\Time\HttpTimeProvider(), // Uses google.com by default
|
||||||
|
new RobThree\Auth\Providers\Time\HttpTimeProvider('https://github.com'),
|
||||||
|
new RobThree\Auth\Providers\Time\HttpTimeProvider('https://yahoo.com'),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testVerifyCodeWorksCorrectly() {
|
||||||
|
|
||||||
|
$tfa = new TwoFactorAuth('Test', 6, 30);
|
||||||
|
$this->assertEquals(true , $tfa->verifyCode('VMR466AB62ZBOKHE', '543160', 1, 1426847190));
|
||||||
|
$this->assertEquals(true , $tfa->verifyCode('VMR466AB62ZBOKHE', '543160', 0, 1426847190 + 29)); //Test discrepancy
|
||||||
|
$this->assertEquals(false, $tfa->verifyCode('VMR466AB62ZBOKHE', '543160', 0, 1426847190 + 30)); //Test discrepancy
|
||||||
|
$this->assertEquals(false, $tfa->verifyCode('VMR466AB62ZBOKHE', '543160', 0, 1426847190 - 1)); //Test discrepancy
|
||||||
|
|
||||||
|
$this->assertEquals(true , $tfa->verifyCode('VMR466AB62ZBOKHE', '543160', 1, 1426847205 + 0)); //Test discrepancy
|
||||||
|
$this->assertEquals(true , $tfa->verifyCode('VMR466AB62ZBOKHE', '543160', 1, 1426847205 + 35)); //Test discrepancy
|
||||||
|
$this->assertEquals(true , $tfa->verifyCode('VMR466AB62ZBOKHE', '543160', 1, 1426847205 - 35)); //Test discrepancy
|
||||||
|
|
||||||
|
$this->assertEquals(false, $tfa->verifyCode('VMR466AB62ZBOKHE', '543160', 1, 1426847205 + 65)); //Test discrepancy
|
||||||
|
$this->assertEquals(false, $tfa->verifyCode('VMR466AB62ZBOKHE', '543160', 1, 1426847205 - 65)); //Test discrepancy
|
||||||
|
|
||||||
|
$this->assertEquals(true , $tfa->verifyCode('VMR466AB62ZBOKHE', '543160', 2, 1426847205 + 65)); //Test discrepancy
|
||||||
|
$this->assertEquals(true , $tfa->verifyCode('VMR466AB62ZBOKHE', '543160', 2, 1426847205 - 65)); //Test discrepancy
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testTotpUriIsCorrect() {
|
||||||
|
$qr = new TestQrProvider();
|
||||||
|
|
||||||
|
$tfa = new TwoFactorAuth('Test&Issuer', 6, 30, 'sha1', $qr);
|
||||||
|
$data = $this->DecodeDataUri($tfa->getQRCodeImageAsDataUri('Test&Label', 'VMR466AB62ZBOKHE'));
|
||||||
|
$this->assertEquals('test/test', $data['mimetype']);
|
||||||
|
$this->assertEquals('base64', $data['encoding']);
|
||||||
|
$this->assertEquals('otpauth://totp/Test%26Label?secret=VMR466AB62ZBOKHE&issuer=Test%26Issuer&period=30&algorithm=SHA1&digits=6@200', $data['data']);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \RobThree\Auth\TwoFactorAuthException
|
||||||
|
*/
|
||||||
|
public function testGetQRCodeImageAsDataUriThrowsOnInvalidSize() {
|
||||||
|
$qr = new TestQrProvider();
|
||||||
|
|
||||||
|
$tfa = new TwoFactorAuth('Test', 6, 30, 'sha1', $qr);
|
||||||
|
$tfa->getQRCodeImageAsDataUri('Test', 'VMR466AB62ZBOKHE', 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \RobThree\Auth\TwoFactorAuthException
|
||||||
|
*/
|
||||||
|
public function testGetCodeThrowsOnInvalidBase32String1() {
|
||||||
|
$tfa = new TwoFactorAuth('Test');
|
||||||
|
$tfa->getCode('FOO1BAR8BAZ9'); //1, 8 & 9 are invalid chars
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \RobThree\Auth\TwoFactorAuthException
|
||||||
|
*/
|
||||||
|
public function testGetCodeThrowsOnInvalidBase32String2() {
|
||||||
|
$tfa = new TwoFactorAuth('Test');
|
||||||
|
$tfa->getCode('mzxw6==='); //Lowercase
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testKnownBase32DecodeTestVectors() {
|
||||||
|
// We usually don't test internals (e.g. privates) but since we rely heavily on base32 decoding and don't want
|
||||||
|
// to expose this method nor do we want to give people the possibility of implementing / providing their own base32
|
||||||
|
// decoding/decoder (as we do with Rng/QR providers for example) we simply test the private base32Decode() method
|
||||||
|
// with some known testvectors **only** to ensure base32 decoding works correctly following RFC's so there won't
|
||||||
|
// be any bugs hiding in there. We **could** 'fool' ourselves by calling the public getCode() method (which uses
|
||||||
|
// base32decode internally) and then make sure getCode's output (in digits) equals expected output since that would
|
||||||
|
// mean the base32Decode() works as expected but that **could** hide some subtle bug(s) in decoding the base32 string.
|
||||||
|
|
||||||
|
// "In general, you don't want to break any encapsulation for the sake of testing (or as Mom used to say, "don't
|
||||||
|
// expose your privates!"). Most of the time, you should be able to test a class by exercising its public methods."
|
||||||
|
// Dave Thomas and Andy Hunt -- "Pragmatic Unit Testing
|
||||||
|
$tfa = new TwoFactorAuth('Test');
|
||||||
|
|
||||||
|
$method = new ReflectionMethod('RobThree\Auth\TwoFactorAuth', 'base32Decode');
|
||||||
|
$method->setAccessible(true);
|
||||||
|
|
||||||
|
// Test vectors from: https://tools.ietf.org/html/rfc4648#page-12
|
||||||
|
$this->assertEquals('', $method->invoke($tfa, ''));
|
||||||
|
$this->assertEquals('f', $method->invoke($tfa, 'MY======'));
|
||||||
|
$this->assertEquals('fo', $method->invoke($tfa, 'MZXQ===='));
|
||||||
|
$this->assertEquals('foo', $method->invoke($tfa, 'MZXW6==='));
|
||||||
|
$this->assertEquals('foob', $method->invoke($tfa, 'MZXW6YQ='));
|
||||||
|
$this->assertEquals('fooba', $method->invoke($tfa, 'MZXW6YTB'));
|
||||||
|
$this->assertEquals('foobar', $method->invoke($tfa, 'MZXW6YTBOI======'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testKnownBase32DecodeUnpaddedTestVectors() {
|
||||||
|
// See testKnownBase32DecodeTestVectors() for the rationale behind testing the private base32Decode() method.
|
||||||
|
// This test ensures that strings without the padding-char ('=') are also decoded correctly.
|
||||||
|
// https://tools.ietf.org/html/rfc4648#page-4:
|
||||||
|
// "In some circumstances, the use of padding ("=") in base-encoded data is not required or used."
|
||||||
|
$tfa = new TwoFactorAuth('Test');
|
||||||
|
|
||||||
|
$method = new ReflectionMethod('RobThree\Auth\TwoFactorAuth', 'base32Decode');
|
||||||
|
$method->setAccessible(true);
|
||||||
|
|
||||||
|
// Test vectors from: https://tools.ietf.org/html/rfc4648#page-12
|
||||||
|
$this->assertEquals('', $method->invoke($tfa, ''));
|
||||||
|
$this->assertEquals('f', $method->invoke($tfa, 'MY'));
|
||||||
|
$this->assertEquals('fo', $method->invoke($tfa, 'MZXQ'));
|
||||||
|
$this->assertEquals('foo', $method->invoke($tfa, 'MZXW6'));
|
||||||
|
$this->assertEquals('foob', $method->invoke($tfa, 'MZXW6YQ'));
|
||||||
|
$this->assertEquals('fooba', $method->invoke($tfa, 'MZXW6YTB'));
|
||||||
|
$this->assertEquals('foobar', $method->invoke($tfa, 'MZXW6YTBOI'));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public function testKnownTestVectors_sha1() {
|
||||||
|
//Known test vectors for SHA1: https://tools.ietf.org/html/rfc6238#page-15
|
||||||
|
$secret = 'GEZDGNBVGY3TQOJQGEZDGNBVGY3TQOJQ'; //== base32encode('12345678901234567890')
|
||||||
|
$tfa = new TwoFactorAuth('Test', 8, 30, 'sha1');
|
||||||
|
$this->assertEquals('94287082', $tfa->getCode($secret, 59));
|
||||||
|
$this->assertEquals('07081804', $tfa->getCode($secret, 1111111109));
|
||||||
|
$this->assertEquals('14050471', $tfa->getCode($secret, 1111111111));
|
||||||
|
$this->assertEquals('89005924', $tfa->getCode($secret, 1234567890));
|
||||||
|
$this->assertEquals('69279037', $tfa->getCode($secret, 2000000000));
|
||||||
|
$this->assertEquals('65353130', $tfa->getCode($secret, 20000000000));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testKnownTestVectors_sha256() {
|
||||||
|
//Known test vectors for SHA256: https://tools.ietf.org/html/rfc6238#page-15
|
||||||
|
$secret = 'GEZDGNBVGY3TQOJQGEZDGNBVGY3TQOJQGEZDGNBVGY3TQOJQGEZA'; //== base32encode('12345678901234567890123456789012')
|
||||||
|
$tfa = new TwoFactorAuth('Test', 8, 30, 'sha256');
|
||||||
|
$this->assertEquals('46119246', $tfa->getCode($secret, 59));
|
||||||
|
$this->assertEquals('68084774', $tfa->getCode($secret, 1111111109));
|
||||||
|
$this->assertEquals('67062674', $tfa->getCode($secret, 1111111111));
|
||||||
|
$this->assertEquals('91819424', $tfa->getCode($secret, 1234567890));
|
||||||
|
$this->assertEquals('90698825', $tfa->getCode($secret, 2000000000));
|
||||||
|
$this->assertEquals('77737706', $tfa->getCode($secret, 20000000000));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testKnownTestVectors_sha512() {
|
||||||
|
//Known test vectors for SHA512: https://tools.ietf.org/html/rfc6238#page-15
|
||||||
|
$secret = 'GEZDGNBVGY3TQOJQGEZDGNBVGY3TQOJQGEZDGNBVGY3TQOJQGEZDGNBVGY3TQOJQGEZDGNBVGY3TQOJQGEZDGNBVGY3TQOJQGEZDGNA'; //== base32encode('1234567890123456789012345678901234567890123456789012345678901234')
|
||||||
|
$tfa = new TwoFactorAuth('Test', 8, 30, 'sha512');
|
||||||
|
$this->assertEquals('90693936', $tfa->getCode($secret, 59));
|
||||||
|
$this->assertEquals('25091201', $tfa->getCode($secret, 1111111109));
|
||||||
|
$this->assertEquals('99943326', $tfa->getCode($secret, 1111111111));
|
||||||
|
$this->assertEquals('93441116', $tfa->getCode($secret, 1234567890));
|
||||||
|
$this->assertEquals('38618901', $tfa->getCode($secret, 2000000000));
|
||||||
|
$this->assertEquals('47863826', $tfa->getCode($secret, 20000000000));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @requires function random_bytes
|
||||||
|
*/
|
||||||
|
public function testCSRNGProvidersReturnExpectedNumberOfBytes() {
|
||||||
|
$rng = new \RobThree\Auth\Providers\Rng\CSRNGProvider();
|
||||||
|
foreach ($this->getRngTestLengths() as $l)
|
||||||
|
$this->assertEquals($l, strlen($rng->getRandomBytes($l)));
|
||||||
|
$this->assertEquals(true, $rng->isCryptographicallySecure());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @requires function hash_algos
|
||||||
|
* @requires function hash
|
||||||
|
*/
|
||||||
|
public function testHashRNGProvidersReturnExpectedNumberOfBytes() {
|
||||||
|
$rng = new \RobThree\Auth\Providers\Rng\HashRNGProvider();
|
||||||
|
foreach ($this->getRngTestLengths() as $l)
|
||||||
|
$this->assertEquals($l, strlen($rng->getRandomBytes($l)));
|
||||||
|
$this->assertEquals(false, $rng->isCryptographicallySecure());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @requires function mcrypt_create_iv
|
||||||
|
*/
|
||||||
|
public function testMCryptRNGProvidersReturnExpectedNumberOfBytes() {
|
||||||
|
$rng = new \RobThree\Auth\Providers\Rng\MCryptRNGProvider();
|
||||||
|
foreach ($this->getRngTestLengths() as $l)
|
||||||
|
$this->assertEquals($l, strlen($rng->getRandomBytes($l)));
|
||||||
|
$this->assertEquals(true, $rng->isCryptographicallySecure());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @requires function openssl_random_pseudo_bytes
|
||||||
|
*/
|
||||||
|
public function testStrongOpenSSLRNGProvidersReturnExpectedNumberOfBytes() {
|
||||||
|
$rng = new \RobThree\Auth\Providers\Rng\OpenSSLRNGProvider(true);
|
||||||
|
foreach ($this->getRngTestLengths() as $l)
|
||||||
|
$this->assertEquals($l, strlen($rng->getRandomBytes($l)));
|
||||||
|
$this->assertEquals(true, $rng->isCryptographicallySecure());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @requires function openssl_random_pseudo_bytes
|
||||||
|
*/
|
||||||
|
public function testNonStrongOpenSSLRNGProvidersReturnExpectedNumberOfBytes() {
|
||||||
|
$rng = new \RobThree\Auth\Providers\Rng\OpenSSLRNGProvider(false);
|
||||||
|
foreach ($this->getRngTestLengths() as $l)
|
||||||
|
$this->assertEquals($l, strlen($rng->getRandomBytes($l)));
|
||||||
|
$this->assertEquals(false, $rng->isCryptographicallySecure());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private function getRngTestLengths() {
|
||||||
|
return array(1, 16, 32, 256);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function DecodeDataUri($datauri) {
|
||||||
|
if (preg_match('/data:(?P<mimetype>[\w\.\-\/]+);(?P<encoding>\w+),(?P<data>.*)/', $datauri, $m) === 1) {
|
||||||
|
return array(
|
||||||
|
'mimetype' => $m['mimetype'],
|
||||||
|
'encoding' => $m['encoding'],
|
||||||
|
'data' => base64_decode($m['data'])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class TestRNGProvider implements IRNGProvider {
|
||||||
|
private $isSecure;
|
||||||
|
|
||||||
|
function __construct($isSecure = false) {
|
||||||
|
$this->isSecure = $isSecure;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getRandomBytes($bytecount) {
|
||||||
|
$result = '';
|
||||||
|
for ($i=0; $i<$bytecount; $i++)
|
||||||
|
$result.=chr($i);
|
||||||
|
return $result;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public function isCryptographicallySecure() {
|
||||||
|
return $this->isSecure;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class TestQrProvider implements IQRCodeProvider {
|
||||||
|
public function getQRCodeImage($qrtext, $size) {
|
||||||
|
return $qrtext . '@' . $size;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getMimeType() {
|
||||||
|
return 'test/test';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class TestTimeProvider implements ITimeProvider {
|
||||||
|
private $time;
|
||||||
|
|
||||||
|
function __construct($time) {
|
||||||
|
$this->time = $time;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getTime() {
|
||||||
|
return $this->time;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
composer.lock
|
||||||
|
vendor/
|
||||||
|
.*.swp
|
||||||
|
php-u2flib-server-*.tar.gz
|
||||||
|
php-u2flib-server-*.tar.gz.sig
|
||||||
|
apidocs/
|
||||||
|
build/
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
language: php
|
||||||
|
sudo: false
|
||||||
|
php:
|
||||||
|
- 5.3
|
||||||
|
- 5.4
|
||||||
|
- 5.5
|
||||||
|
- 5.6
|
||||||
|
- 7.0
|
||||||
|
- hhvm
|
||||||
|
- hhvm-nightly
|
||||||
|
after_success:
|
||||||
|
- test -z $COVERALLS || (composer require satooshi/php-coveralls && vendor/bin/coveralls -v)
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- php: 5.6
|
||||||
|
env: COVERALLS=true
|
||||||
|
allow_failures:
|
||||||
|
- php: hhvm
|
||||||
|
- php: hhvm-nightly
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
Author: Yubico
|
||||||
|
Basename: php-u2flib-server
|
||||||
|
Homepage: https://developers.yubico.com/php-u2flib-server
|
||||||
|
License: BSD-2-Clause
|
||||||
|
Name: Native U2F library in PHP
|
||||||
|
Project: php-u2flib-server
|
||||||
|
Summary: Native U2F library in PHP
|
||||||
|
Yubico-Category: U2F projects
|
||||||
|
Travis: https://travis-ci.org/Yubico/php-u2flib-server
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
Copyright (c) 2014 Yubico AB
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
modification, are permitted provided that the following conditions are
|
||||||
|
met:
|
||||||
|
|
||||||
|
* Redistributions of source code must retain the above copyright
|
||||||
|
notice, this list of conditions and the following disclaimer.
|
||||||
|
|
||||||
|
* Redistributions in binary form must reproduce the above
|
||||||
|
copyright notice, this list of conditions and the following
|
||||||
|
disclaimer in the documentation and/or other materials provided
|
||||||
|
with the distribution.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
@ -0,0 +1,24 @@
|
||||||
|
php-u2flib-server NEWS -- History of user-visible changes.
|
||||||
|
|
||||||
|
* Version 1.0.0 (released 2016-02-19)
|
||||||
|
** Give an early error on openssl < 1.0
|
||||||
|
** Support devices with initial counter 0
|
||||||
|
** Fixes to examples
|
||||||
|
** Handle errorCode: 0 correctly
|
||||||
|
|
||||||
|
* Version 0.1.0 (released 2015-03-03)
|
||||||
|
** Use openssl for all crypto instead of third party extensions.
|
||||||
|
** Properly check the request challenge on authenticate.
|
||||||
|
** Switch from returning error codes to throwing exceptions.
|
||||||
|
** Stop recommending composer for installation.
|
||||||
|
|
||||||
|
* Version 0.0.2 (released 2014-10-24)
|
||||||
|
** Refactor the API to return objects instead of encoded objects.
|
||||||
|
** Add a second example that uses PDO to store registrations.
|
||||||
|
** Add documentation to the API.
|
||||||
|
** Check that randomness returned is good.
|
||||||
|
** Drop the unneeded mcrypt extension.
|
||||||
|
** More tests.
|
||||||
|
|
||||||
|
* Version 0.0.1 (released 2014-10-16)
|
||||||
|
** Initial release.
|
||||||
|
|
@ -0,0 +1,34 @@
|
||||||
|
php-u2flib-server
|
||||||
|
-----------------
|
||||||
|
|
||||||
|
image:https://travis-ci.org/Yubico/php-u2flib-server.svg?branch=master["Build Status", link="https://travis-ci.org/Yubico/php-u2flib-server"]
|
||||||
|
image:https://coveralls.io/repos/Yubico/php-u2flib-server/badge.svg?branch=master&service=github["Coverage", link="https://coveralls.io/github/Yubico/php-u2flib-server?branch=master"]
|
||||||
|
image:https://scrutinizer-ci.com/g/Yubico/php-u2flib-server/badges/quality-score.png?b=master["Scrutinizer Code Quality", link="https://scrutinizer-ci.com/g/Yubico/php-u2flib-server/?branch=master"]
|
||||||
|
|
||||||
|
=== Introduction ===
|
||||||
|
|
||||||
|
Serverside U2F library for PHP. Provides functionality for registering
|
||||||
|
tokens and authentication with said tokens.
|
||||||
|
|
||||||
|
To read more about U2F and how to use a U2F library, visit
|
||||||
|
link:http://developers.yubico.com/U2F[developers.yubico.com/U2F].
|
||||||
|
|
||||||
|
=== License ===
|
||||||
|
|
||||||
|
The project is licensed under a BSD license. See the file COPYING for
|
||||||
|
exact wording. For any copyright year range specified as YYYY-ZZZZ in
|
||||||
|
this package note that the range specifies every single year in that
|
||||||
|
closed interval.
|
||||||
|
|
||||||
|
=== Dependencies ===
|
||||||
|
|
||||||
|
The only dependency is the openssl extension to PHP that has to be enabled.
|
||||||
|
|
||||||
|
A composer.json is included in the distribution to make things simpler for
|
||||||
|
other project using composer.
|
||||||
|
|
||||||
|
=== Tests ===
|
||||||
|
|
||||||
|
To run the test suite link:https://phpunit.de[PHPUnit] is required. To run it, type:
|
||||||
|
|
||||||
|
$ phpunit
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
README
|
||||||
|
|
@ -0,0 +1,12 @@
|
||||||
|
destination: apidocs
|
||||||
|
|
||||||
|
source:
|
||||||
|
- src/u2flib_server
|
||||||
|
|
||||||
|
exclude: "*/tests/*"
|
||||||
|
|
||||||
|
groups: none
|
||||||
|
|
||||||
|
tree: false
|
||||||
|
|
||||||
|
title: php-u2flib-server API
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"name":"yubico/u2flib-server",
|
||||||
|
"description":"Library for U2F implementation",
|
||||||
|
"homepage":"https://developers.yubico.com/php-u2flib-server",
|
||||||
|
"license":"BSD-2-Clause",
|
||||||
|
"require": {
|
||||||
|
"ext-openssl":"*"
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"classmap": ["src/"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -0,0 +1,40 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
VERSION=$1
|
||||||
|
PGP_KEYID=$2
|
||||||
|
|
||||||
|
if [ "x$PGP_KEYID" = "x" ]; then
|
||||||
|
echo "try with $0 VERSION PGP_KEYID"
|
||||||
|
echo "example: $0 0.0.1 B2168C0A"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! head -3 NEWS | grep -q "Version $VERSION .released `date -I`"; then
|
||||||
|
echo "You need to update date/version in NEWS"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "x$YUBICO_GITHUB_REPO" = "x" ]; then
|
||||||
|
echo "you need to define YUBICO_GITHUB_REPO"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
releasename=php-u2flib-server-${VERSION}
|
||||||
|
|
||||||
|
git push
|
||||||
|
git tag -u ${PGP_KEYID} -m $VERSION $VERSION
|
||||||
|
git push --tags
|
||||||
|
tmpdir=`mktemp -d /tmp/release.XXXXXX`
|
||||||
|
releasedir=${tmpdir}/${releasename}
|
||||||
|
mkdir -p $releasedir
|
||||||
|
git archive $VERSION --format=tar | tar -xC $releasedir
|
||||||
|
git2cl > $releasedir/ChangeLog
|
||||||
|
cd $releasedir
|
||||||
|
apigen
|
||||||
|
cd -
|
||||||
|
tar -cz --directory=$tmpdir --file=${releasename}.tar.gz $releasename
|
||||||
|
gpg --detach-sign --default-key $PGP_KEYID ${releasename}.tar.gz
|
||||||
|
$YUBICO_GITHUB_REPO/publish php-u2flib-server $VERSION ${releasename}.tar.gz*
|
||||||
|
rm -rf $tmpdir
|
||||||
|
|
@ -0,0 +1,651 @@
|
||||||
|
// Copyright 2014-2015 Google Inc. All rights reserved.
|
||||||
|
//
|
||||||
|
// Use of this source code is governed by a BSD-style
|
||||||
|
// license that can be found in the LICENSE file or at
|
||||||
|
// https://developers.google.com/open-source/licenses/bsd
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @fileoverview The U2F api.
|
||||||
|
*/
|
||||||
|
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
/** Namespace for the U2F api.
|
||||||
|
* @type {Object}
|
||||||
|
*/
|
||||||
|
var u2f = u2f || {};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The U2F extension id
|
||||||
|
* @type {string}
|
||||||
|
* @const
|
||||||
|
*/
|
||||||
|
u2f.EXTENSION_ID = 'kmendfapggjehodndflmmgagdbamhnfd';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Message types for messsages to/from the extension
|
||||||
|
* @const
|
||||||
|
* @enum {string}
|
||||||
|
*/
|
||||||
|
u2f.MessageTypes = {
|
||||||
|
'U2F_REGISTER_REQUEST': 'u2f_register_request',
|
||||||
|
'U2F_SIGN_REQUEST': 'u2f_sign_request',
|
||||||
|
'U2F_REGISTER_RESPONSE': 'u2f_register_response',
|
||||||
|
'U2F_SIGN_RESPONSE': 'u2f_sign_response'
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Response status codes
|
||||||
|
* @const
|
||||||
|
* @enum {number}
|
||||||
|
*/
|
||||||
|
u2f.ErrorCodes = {
|
||||||
|
'OK': 0,
|
||||||
|
'OTHER_ERROR': 1,
|
||||||
|
'BAD_REQUEST': 2,
|
||||||
|
'CONFIGURATION_UNSUPPORTED': 3,
|
||||||
|
'DEVICE_INELIGIBLE': 4,
|
||||||
|
'TIMEOUT': 5
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A message type for registration requests
|
||||||
|
* @typedef {{
|
||||||
|
* type: u2f.MessageTypes,
|
||||||
|
* signRequests: Array<u2f.SignRequest>,
|
||||||
|
* registerRequests: ?Array<u2f.RegisterRequest>,
|
||||||
|
* timeoutSeconds: ?number,
|
||||||
|
* requestId: ?number
|
||||||
|
* }}
|
||||||
|
*/
|
||||||
|
u2f.Request;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A message for registration responses
|
||||||
|
* @typedef {{
|
||||||
|
* type: u2f.MessageTypes,
|
||||||
|
* responseData: (u2f.Error | u2f.RegisterResponse | u2f.SignResponse),
|
||||||
|
* requestId: ?number
|
||||||
|
* }}
|
||||||
|
*/
|
||||||
|
u2f.Response;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An error object for responses
|
||||||
|
* @typedef {{
|
||||||
|
* errorCode: u2f.ErrorCodes,
|
||||||
|
* errorMessage: ?string
|
||||||
|
* }}
|
||||||
|
*/
|
||||||
|
u2f.Error;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Data object for a single sign request.
|
||||||
|
* @typedef {{
|
||||||
|
* version: string,
|
||||||
|
* challenge: string,
|
||||||
|
* keyHandle: string,
|
||||||
|
* appId: string
|
||||||
|
* }}
|
||||||
|
*/
|
||||||
|
u2f.SignRequest;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Data object for a sign response.
|
||||||
|
* @typedef {{
|
||||||
|
* keyHandle: string,
|
||||||
|
* signatureData: string,
|
||||||
|
* clientData: string
|
||||||
|
* }}
|
||||||
|
*/
|
||||||
|
u2f.SignResponse;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Data object for a registration request.
|
||||||
|
* @typedef {{
|
||||||
|
* version: string,
|
||||||
|
* challenge: string,
|
||||||
|
* appId: string
|
||||||
|
* }}
|
||||||
|
*/
|
||||||
|
u2f.RegisterRequest;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Data object for a registration response.
|
||||||
|
* @typedef {{
|
||||||
|
* registrationData: string,
|
||||||
|
* clientData: string
|
||||||
|
* }}
|
||||||
|
*/
|
||||||
|
u2f.RegisterResponse;
|
||||||
|
|
||||||
|
|
||||||
|
// Low level MessagePort API support
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets up a MessagePort to the U2F extension using the
|
||||||
|
* available mechanisms.
|
||||||
|
* @param {function((MessagePort|u2f.WrappedChromeRuntimePort_))} callback
|
||||||
|
*/
|
||||||
|
u2f.getMessagePort = function(callback) {
|
||||||
|
if (typeof chrome != 'undefined' && chrome.runtime) {
|
||||||
|
// The actual message here does not matter, but we need to get a reply
|
||||||
|
// for the callback to run. Thus, send an empty signature request
|
||||||
|
// in order to get a failure response.
|
||||||
|
var msg = {
|
||||||
|
type: u2f.MessageTypes.U2F_SIGN_REQUEST,
|
||||||
|
signRequests: []
|
||||||
|
};
|
||||||
|
chrome.runtime.sendMessage(u2f.EXTENSION_ID, msg, function() {
|
||||||
|
if (!chrome.runtime.lastError) {
|
||||||
|
// We are on a whitelisted origin and can talk directly
|
||||||
|
// with the extension.
|
||||||
|
u2f.getChromeRuntimePort_(callback);
|
||||||
|
} else {
|
||||||
|
// chrome.runtime was available, but we couldn't message
|
||||||
|
// the extension directly, use iframe
|
||||||
|
u2f.getIframePort_(callback);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else if (u2f.isAndroidChrome_()) {
|
||||||
|
u2f.getAuthenticatorPort_(callback);
|
||||||
|
} else {
|
||||||
|
// chrome.runtime was not available at all, which is normal
|
||||||
|
// when this origin doesn't have access to any extensions.
|
||||||
|
u2f.getIframePort_(callback);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Detect chrome running on android based on the browser's useragent.
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
u2f.isAndroidChrome_ = function() {
|
||||||
|
var userAgent = navigator.userAgent;
|
||||||
|
return userAgent.indexOf('Chrome') != -1 &&
|
||||||
|
userAgent.indexOf('Android') != -1;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Connects directly to the extension via chrome.runtime.connect
|
||||||
|
* @param {function(u2f.WrappedChromeRuntimePort_)} callback
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
u2f.getChromeRuntimePort_ = function(callback) {
|
||||||
|
var port = chrome.runtime.connect(u2f.EXTENSION_ID,
|
||||||
|
{'includeTlsChannelId': true});
|
||||||
|
setTimeout(function() {
|
||||||
|
callback(new u2f.WrappedChromeRuntimePort_(port));
|
||||||
|
}, 0);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return a 'port' abstraction to the Authenticator app.
|
||||||
|
* @param {function(u2f.WrappedAuthenticatorPort_)} callback
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
u2f.getAuthenticatorPort_ = function(callback) {
|
||||||
|
setTimeout(function() {
|
||||||
|
callback(new u2f.WrappedAuthenticatorPort_());
|
||||||
|
}, 0);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A wrapper for chrome.runtime.Port that is compatible with MessagePort.
|
||||||
|
* @param {Port} port
|
||||||
|
* @constructor
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
u2f.WrappedChromeRuntimePort_ = function(port) {
|
||||||
|
this.port_ = port;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Format a return a sign request.
|
||||||
|
* @param {Array<u2f.SignRequest>} signRequests
|
||||||
|
* @param {number} timeoutSeconds
|
||||||
|
* @param {number} reqId
|
||||||
|
* @return {Object}
|
||||||
|
*/
|
||||||
|
u2f.WrappedChromeRuntimePort_.prototype.formatSignRequest_ =
|
||||||
|
function(signRequests, timeoutSeconds, reqId) {
|
||||||
|
return {
|
||||||
|
type: u2f.MessageTypes.U2F_SIGN_REQUEST,
|
||||||
|
signRequests: signRequests,
|
||||||
|
timeoutSeconds: timeoutSeconds,
|
||||||
|
requestId: reqId
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Format a return a register request.
|
||||||
|
* @param {Array<u2f.SignRequest>} signRequests
|
||||||
|
* @param {Array<u2f.RegisterRequest>} signRequests
|
||||||
|
* @param {number} timeoutSeconds
|
||||||
|
* @param {number} reqId
|
||||||
|
* @return {Object}
|
||||||
|
*/
|
||||||
|
u2f.WrappedChromeRuntimePort_.prototype.formatRegisterRequest_ =
|
||||||
|
function(signRequests, registerRequests, timeoutSeconds, reqId) {
|
||||||
|
return {
|
||||||
|
type: u2f.MessageTypes.U2F_REGISTER_REQUEST,
|
||||||
|
signRequests: signRequests,
|
||||||
|
registerRequests: registerRequests,
|
||||||
|
timeoutSeconds: timeoutSeconds,
|
||||||
|
requestId: reqId
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Posts a message on the underlying channel.
|
||||||
|
* @param {Object} message
|
||||||
|
*/
|
||||||
|
u2f.WrappedChromeRuntimePort_.prototype.postMessage = function(message) {
|
||||||
|
this.port_.postMessage(message);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Emulates the HTML 5 addEventListener interface. Works only for the
|
||||||
|
* onmessage event, which is hooked up to the chrome.runtime.Port.onMessage.
|
||||||
|
* @param {string} eventName
|
||||||
|
* @param {function({data: Object})} handler
|
||||||
|
*/
|
||||||
|
u2f.WrappedChromeRuntimePort_.prototype.addEventListener =
|
||||||
|
function(eventName, handler) {
|
||||||
|
var name = eventName.toLowerCase();
|
||||||
|
if (name == 'message' || name == 'onmessage') {
|
||||||
|
this.port_.onMessage.addListener(function(message) {
|
||||||
|
// Emulate a minimal MessageEvent object
|
||||||
|
handler({'data': message});
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
console.error('WrappedChromeRuntimePort only supports onMessage');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Wrap the Authenticator app with a MessagePort interface.
|
||||||
|
* @constructor
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
u2f.WrappedAuthenticatorPort_ = function() {
|
||||||
|
this.requestId_ = -1;
|
||||||
|
this.requestObject_ = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Launch the Authenticator intent.
|
||||||
|
* @param {Object} message
|
||||||
|
*/
|
||||||
|
u2f.WrappedAuthenticatorPort_.prototype.postMessage = function(message) {
|
||||||
|
var intentLocation = /** @type {string} */ (message);
|
||||||
|
document.location = intentLocation;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Emulates the HTML 5 addEventListener interface.
|
||||||
|
* @param {string} eventName
|
||||||
|
* @param {function({data: Object})} handler
|
||||||
|
*/
|
||||||
|
u2f.WrappedAuthenticatorPort_.prototype.addEventListener =
|
||||||
|
function(eventName, handler) {
|
||||||
|
var name = eventName.toLowerCase();
|
||||||
|
if (name == 'message') {
|
||||||
|
var self = this;
|
||||||
|
/* Register a callback to that executes when
|
||||||
|
* chrome injects the response. */
|
||||||
|
window.addEventListener(
|
||||||
|
'message', self.onRequestUpdate_.bind(self, handler), false);
|
||||||
|
} else {
|
||||||
|
console.error('WrappedAuthenticatorPort only supports message');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Callback invoked when a response is received from the Authenticator.
|
||||||
|
* @param function({data: Object}) callback
|
||||||
|
* @param {Object} message message Object
|
||||||
|
*/
|
||||||
|
u2f.WrappedAuthenticatorPort_.prototype.onRequestUpdate_ =
|
||||||
|
function(callback, message) {
|
||||||
|
var messageObject = JSON.parse(message.data);
|
||||||
|
var intentUrl = messageObject['intentURL'];
|
||||||
|
|
||||||
|
var errorCode = messageObject['errorCode'];
|
||||||
|
var responseObject = null;
|
||||||
|
if (messageObject.hasOwnProperty('data')) {
|
||||||
|
responseObject = /** @type {Object} */ (
|
||||||
|
JSON.parse(messageObject['data']));
|
||||||
|
responseObject['requestId'] = this.requestId_;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Sign responses from the authenticator do not conform to U2F,
|
||||||
|
* convert to U2F here. */
|
||||||
|
responseObject = this.doResponseFixups_(responseObject);
|
||||||
|
callback({'data': responseObject});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fixup the response provided by the Authenticator to conform with
|
||||||
|
* the U2F spec.
|
||||||
|
* @param {Object} responseData
|
||||||
|
* @return {Object} the U2F compliant response object
|
||||||
|
*/
|
||||||
|
u2f.WrappedAuthenticatorPort_.prototype.doResponseFixups_ =
|
||||||
|
function(responseObject) {
|
||||||
|
if (responseObject.hasOwnProperty('responseData')) {
|
||||||
|
return responseObject;
|
||||||
|
} else if (this.requestObject_['type'] != u2f.MessageTypes.U2F_SIGN_REQUEST) {
|
||||||
|
// Only sign responses require fixups. If this is not a response
|
||||||
|
// to a sign request, then an internal error has occurred.
|
||||||
|
return {
|
||||||
|
'type': u2f.MessageTypes.U2F_REGISTER_RESPONSE,
|
||||||
|
'responseData': {
|
||||||
|
'errorCode': u2f.ErrorCodes.OTHER_ERROR,
|
||||||
|
'errorMessage': 'Internal error: invalid response from Authenticator'
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Non-conformant sign response, do fixups. */
|
||||||
|
var encodedChallengeObject = responseObject['challenge'];
|
||||||
|
if (typeof encodedChallengeObject !== 'undefined') {
|
||||||
|
var challengeObject = JSON.parse(atob(encodedChallengeObject));
|
||||||
|
var serverChallenge = challengeObject['challenge'];
|
||||||
|
var challengesList = this.requestObject_['signData'];
|
||||||
|
var requestChallengeObject = null;
|
||||||
|
for (var i = 0; i < challengesList.length; i++) {
|
||||||
|
var challengeObject = challengesList[i];
|
||||||
|
if (challengeObject['keyHandle'] == responseObject['keyHandle']) {
|
||||||
|
requestChallengeObject = challengeObject;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var responseData = {
|
||||||
|
'errorCode': responseObject['resultCode'],
|
||||||
|
'keyHandle': responseObject['keyHandle'],
|
||||||
|
'signatureData': responseObject['signature'],
|
||||||
|
'clientData': encodedChallengeObject
|
||||||
|
};
|
||||||
|
return {
|
||||||
|
'type': u2f.MessageTypes.U2F_SIGN_RESPONSE,
|
||||||
|
'responseData': responseData,
|
||||||
|
'requestId': responseObject['requestId']
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Base URL for intents to Authenticator.
|
||||||
|
* @const
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
u2f.WrappedAuthenticatorPort_.INTENT_URL_BASE_ =
|
||||||
|
'intent:#Intent;action=com.google.android.apps.authenticator.AUTHENTICATE';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Format a return a sign request.
|
||||||
|
* @param {Array<u2f.SignRequest>} signRequests
|
||||||
|
* @param {number} timeoutSeconds (ignored for now)
|
||||||
|
* @param {number} reqId
|
||||||
|
* @return {string}
|
||||||
|
*/
|
||||||
|
u2f.WrappedAuthenticatorPort_.prototype.formatSignRequest_ =
|
||||||
|
function(signRequests, timeoutSeconds, reqId) {
|
||||||
|
if (!signRequests || signRequests.length == 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
/* TODO(fixme): stash away requestId, as the authenticator app does
|
||||||
|
* not return it for sign responses. */
|
||||||
|
this.requestId_ = reqId;
|
||||||
|
/* TODO(fixme): stash away the signRequests, to deal with the legacy
|
||||||
|
* response format returned by the Authenticator app. */
|
||||||
|
this.requestObject_ = {
|
||||||
|
'type': u2f.MessageTypes.U2F_SIGN_REQUEST,
|
||||||
|
'signData': signRequests,
|
||||||
|
'requestId': reqId,
|
||||||
|
'timeout': timeoutSeconds
|
||||||
|
};
|
||||||
|
|
||||||
|
var appId = signRequests[0]['appId'];
|
||||||
|
var intentUrl =
|
||||||
|
u2f.WrappedAuthenticatorPort_.INTENT_URL_BASE_ +
|
||||||
|
';S.appId=' + encodeURIComponent(appId) +
|
||||||
|
';S.eventId=' + reqId +
|
||||||
|
';S.challenges=' +
|
||||||
|
encodeURIComponent(
|
||||||
|
JSON.stringify(this.getBrowserDataList_(signRequests))) + ';end';
|
||||||
|
return intentUrl;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the browser data objects from the challenge list
|
||||||
|
* @param {Array} challenges list of challenges
|
||||||
|
* @return {Array} list of browser data objects
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
u2f.WrappedAuthenticatorPort_
|
||||||
|
.prototype.getBrowserDataList_ = function(challenges) {
|
||||||
|
return challenges
|
||||||
|
.map(function(challenge) {
|
||||||
|
var browserData = {
|
||||||
|
'typ': 'navigator.id.getAssertion',
|
||||||
|
'challenge': challenge['challenge']
|
||||||
|
};
|
||||||
|
var challengeObject = {
|
||||||
|
'challenge' : browserData,
|
||||||
|
'keyHandle' : challenge['keyHandle']
|
||||||
|
};
|
||||||
|
return challengeObject;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Format a return a register request.
|
||||||
|
* @param {Array<u2f.SignRequest>} signRequests
|
||||||
|
* @param {Array<u2f.RegisterRequest>} enrollChallenges
|
||||||
|
* @param {number} timeoutSeconds (ignored for now)
|
||||||
|
* @param {number} reqId
|
||||||
|
* @return {Object}
|
||||||
|
*/
|
||||||
|
u2f.WrappedAuthenticatorPort_.prototype.formatRegisterRequest_ =
|
||||||
|
function(signRequests, enrollChallenges, timeoutSeconds, reqId) {
|
||||||
|
if (!enrollChallenges || enrollChallenges.length == 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
// Assume the appId is the same for all enroll challenges.
|
||||||
|
var appId = enrollChallenges[0]['appId'];
|
||||||
|
var registerRequests = [];
|
||||||
|
for (var i = 0; i < enrollChallenges.length; i++) {
|
||||||
|
var registerRequest = {
|
||||||
|
'challenge': enrollChallenges[i]['challenge'],
|
||||||
|
'version': enrollChallenges[i]['version']
|
||||||
|
};
|
||||||
|
if (enrollChallenges[i]['appId'] != appId) {
|
||||||
|
// Only include the appId when it differs from the first appId.
|
||||||
|
registerRequest['appId'] = enrollChallenges[i]['appId'];
|
||||||
|
}
|
||||||
|
registerRequests.push(registerRequest);
|
||||||
|
}
|
||||||
|
var registeredKeys = [];
|
||||||
|
if (signRequests) {
|
||||||
|
for (i = 0; i < signRequests.length; i++) {
|
||||||
|
var key = {
|
||||||
|
'keyHandle': signRequests[i]['keyHandle'],
|
||||||
|
'version': signRequests[i]['version']
|
||||||
|
};
|
||||||
|
// Only include the appId when it differs from the appId that's
|
||||||
|
// being registered now.
|
||||||
|
if (signRequests[i]['appId'] != appId) {
|
||||||
|
key['appId'] = signRequests[i]['appId'];
|
||||||
|
}
|
||||||
|
registeredKeys.push(key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var request = {
|
||||||
|
'type': u2f.MessageTypes.U2F_REGISTER_REQUEST,
|
||||||
|
'appId': appId,
|
||||||
|
'registerRequests': registerRequests,
|
||||||
|
'registeredKeys': registeredKeys,
|
||||||
|
'requestId': reqId,
|
||||||
|
'timeoutSeconds': timeoutSeconds
|
||||||
|
};
|
||||||
|
var intentUrl =
|
||||||
|
u2f.WrappedAuthenticatorPort_.INTENT_URL_BASE_ +
|
||||||
|
';S.request=' + encodeURIComponent(JSON.stringify(request)) +
|
||||||
|
';end';
|
||||||
|
/* TODO(fixme): stash away requestId, this is is not necessary for
|
||||||
|
* register requests, but here to keep parity with sign.
|
||||||
|
*/
|
||||||
|
this.requestId_ = reqId;
|
||||||
|
return intentUrl;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets up an embedded trampoline iframe, sourced from the extension.
|
||||||
|
* @param {function(MessagePort)} callback
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
u2f.getIframePort_ = function(callback) {
|
||||||
|
// Create the iframe
|
||||||
|
var iframeOrigin = 'chrome-extension://' + u2f.EXTENSION_ID;
|
||||||
|
var iframe = document.createElement('iframe');
|
||||||
|
iframe.src = iframeOrigin + '/u2f-comms.html';
|
||||||
|
iframe.setAttribute('style', 'display:none');
|
||||||
|
document.body.appendChild(iframe);
|
||||||
|
|
||||||
|
var channel = new MessageChannel();
|
||||||
|
var ready = function(message) {
|
||||||
|
if (message.data == 'ready') {
|
||||||
|
channel.port1.removeEventListener('message', ready);
|
||||||
|
callback(channel.port1);
|
||||||
|
} else {
|
||||||
|
console.error('First event on iframe port was not "ready"');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
channel.port1.addEventListener('message', ready);
|
||||||
|
channel.port1.start();
|
||||||
|
|
||||||
|
iframe.addEventListener('load', function() {
|
||||||
|
// Deliver the port to the iframe and initialize
|
||||||
|
iframe.contentWindow.postMessage('init', iframeOrigin, [channel.port2]);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
// High-level JS API
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Default extension response timeout in seconds.
|
||||||
|
* @const
|
||||||
|
*/
|
||||||
|
u2f.EXTENSION_TIMEOUT_SEC = 30;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A singleton instance for a MessagePort to the extension.
|
||||||
|
* @type {MessagePort|u2f.WrappedChromeRuntimePort_}
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
u2f.port_ = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Callbacks waiting for a port
|
||||||
|
* @type {Array<function((MessagePort|u2f.WrappedChromeRuntimePort_))>}
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
u2f.waitingForPort_ = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A counter for requestIds.
|
||||||
|
* @type {number}
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
u2f.reqCounter_ = 0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A map from requestIds to client callbacks
|
||||||
|
* @type {Object.<number,(function((u2f.Error|u2f.RegisterResponse))
|
||||||
|
* |function((u2f.Error|u2f.SignResponse)))>}
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
u2f.callbackMap_ = {};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates or retrieves the MessagePort singleton to use.
|
||||||
|
* @param {function((MessagePort|u2f.WrappedChromeRuntimePort_))} callback
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
u2f.getPortSingleton_ = function(callback) {
|
||||||
|
if (u2f.port_) {
|
||||||
|
callback(u2f.port_);
|
||||||
|
} else {
|
||||||
|
if (u2f.waitingForPort_.length == 0) {
|
||||||
|
u2f.getMessagePort(function(port) {
|
||||||
|
u2f.port_ = port;
|
||||||
|
u2f.port_.addEventListener('message',
|
||||||
|
/** @type {function(Event)} */ (u2f.responseHandler_));
|
||||||
|
|
||||||
|
// Careful, here be async callbacks. Maybe.
|
||||||
|
while (u2f.waitingForPort_.length)
|
||||||
|
u2f.waitingForPort_.shift()(u2f.port_);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
u2f.waitingForPort_.push(callback);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles response messages from the extension.
|
||||||
|
* @param {MessageEvent.<u2f.Response>} message
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
u2f.responseHandler_ = function(message) {
|
||||||
|
var response = message.data;
|
||||||
|
var reqId = response['requestId'];
|
||||||
|
if (!reqId || !u2f.callbackMap_[reqId]) {
|
||||||
|
console.error('Unknown or missing requestId in response.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var cb = u2f.callbackMap_[reqId];
|
||||||
|
delete u2f.callbackMap_[reqId];
|
||||||
|
cb(response['responseData']);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Dispatches an array of sign requests to available U2F tokens.
|
||||||
|
* @param {Array<u2f.SignRequest>} signRequests
|
||||||
|
* @param {function((u2f.Error|u2f.SignResponse))} callback
|
||||||
|
* @param {number=} opt_timeoutSeconds
|
||||||
|
*/
|
||||||
|
u2f.sign = function(signRequests, callback, opt_timeoutSeconds) {
|
||||||
|
u2f.getPortSingleton_(function(port) {
|
||||||
|
var reqId = ++u2f.reqCounter_;
|
||||||
|
u2f.callbackMap_[reqId] = callback;
|
||||||
|
var timeoutSeconds = (typeof opt_timeoutSeconds !== 'undefined' ?
|
||||||
|
opt_timeoutSeconds : u2f.EXTENSION_TIMEOUT_SEC);
|
||||||
|
var req = port.formatSignRequest_(signRequests, timeoutSeconds, reqId);
|
||||||
|
port.postMessage(req);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Dispatches register requests to available U2F tokens. An array of sign
|
||||||
|
* requests identifies already registered tokens.
|
||||||
|
* @param {Array<u2f.RegisterRequest>} registerRequests
|
||||||
|
* @param {Array<u2f.SignRequest>} signRequests
|
||||||
|
* @param {function((u2f.Error|u2f.RegisterResponse))} callback
|
||||||
|
* @param {number=} opt_timeoutSeconds
|
||||||
|
*/
|
||||||
|
u2f.register = function(registerRequests, signRequests,
|
||||||
|
callback, opt_timeoutSeconds) {
|
||||||
|
u2f.getPortSingleton_(function(port) {
|
||||||
|
var reqId = ++u2f.reqCounter_;
|
||||||
|
u2f.callbackMap_[reqId] = callback;
|
||||||
|
var timeoutSeconds = (typeof opt_timeoutSeconds !== 'undefined' ?
|
||||||
|
opt_timeoutSeconds : u2f.EXTENSION_TIMEOUT_SEC);
|
||||||
|
var req = port.formatRegisterRequest_(
|
||||||
|
signRequests, registerRequests, timeoutSeconds, reqId);
|
||||||
|
port.postMessage(req);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
@ -0,0 +1,83 @@
|
||||||
|
#!/usr/bin/php
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/* Copyright (c) 2015 Yubico AB
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are
|
||||||
|
* met:
|
||||||
|
*
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* * Redistributions in binary form must reproduce the above
|
||||||
|
* copyright notice, this list of conditions and the following
|
||||||
|
* disclaimer in the documentation and/or other materials provided
|
||||||
|
* with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This is a basic example of a u2f-server command line that can be used
|
||||||
|
* with the u2f-host binary to perform regitrations and authentications.
|
||||||
|
*/
|
||||||
|
|
||||||
|
require_once('../../src/u2flib_server/U2F.php');
|
||||||
|
|
||||||
|
$options = getopt("rao:R:");
|
||||||
|
$mode;
|
||||||
|
$challenge;
|
||||||
|
$response;
|
||||||
|
$result;
|
||||||
|
$regs;
|
||||||
|
|
||||||
|
if(array_key_exists('r', $options)) {
|
||||||
|
$mode = "register";
|
||||||
|
} elseif(array_key_exists('a', $options)) {
|
||||||
|
if(!array_key_exists('R', $options)) {
|
||||||
|
print "a registration must be supplied with -R";
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
$regs = json_decode('[' . $options['R'] . ']');
|
||||||
|
$mode = "authenticate";
|
||||||
|
} else {
|
||||||
|
print "-r or -a must be used\n";
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
if(!array_key_exists('o', $options)) {
|
||||||
|
print "origin must be supplied with -o\n";
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
$u2f = new u2flib_server\U2F($options['o']);
|
||||||
|
|
||||||
|
if($mode === "register") {
|
||||||
|
$challenge = $u2f->getRegisterData();
|
||||||
|
} elseif($mode === "authenticate") {
|
||||||
|
$challenge = $u2f->getAuthenticateData($regs);
|
||||||
|
}
|
||||||
|
|
||||||
|
print json_encode($challenge[0]) . "\n";
|
||||||
|
$response = fgets(STDIN);
|
||||||
|
|
||||||
|
if($mode === "register") {
|
||||||
|
$result = $u2f->doRegister($challenge[0], json_decode($response));
|
||||||
|
} elseif($mode === "authenticate") {
|
||||||
|
$result = $u2f->doAuthenticate($challenge, $regs, json_decode($response));
|
||||||
|
}
|
||||||
|
|
||||||
|
print json_encode($result) . "\n";
|
||||||
|
|
||||||
|
?>
|
||||||
|
|
@ -0,0 +1,186 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Copyright (c) 2014 Yubico AB
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are
|
||||||
|
* met:
|
||||||
|
*
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* * Redistributions in binary form must reproduce the above
|
||||||
|
* copyright notice, this list of conditions and the following
|
||||||
|
* disclaimer in the documentation and/or other materials provided
|
||||||
|
* with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This is a minimal example of U2F registration and authentication.
|
||||||
|
* The data that has to be stored between registration and authentication
|
||||||
|
* is stored in browser localStorage, so there's nothing real-world
|
||||||
|
* about this.
|
||||||
|
*/
|
||||||
|
require_once('../../src/u2flib_server/U2F.php');
|
||||||
|
$scheme = isset($_SERVER['HTTPS']) ? "https://" : "http://";
|
||||||
|
$u2f = new u2flib_server\U2F($scheme . $_SERVER['HTTP_HOST']);
|
||||||
|
?>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>PHP U2F Demo</title>
|
||||||
|
|
||||||
|
<script src="../assets/u2f-api.js"></script>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
function addRegistration(reg) {
|
||||||
|
var existing = localStorage.getItem('u2fregistration');
|
||||||
|
var regobj = JSON.parse(reg);
|
||||||
|
var data = null;
|
||||||
|
if(existing) {
|
||||||
|
data = JSON.parse(existing);
|
||||||
|
if(Array.isArray(data)) {
|
||||||
|
for (var i = 0; i < data.length; i++) {
|
||||||
|
if(data[i].keyHandle === regobj.keyHandle) {
|
||||||
|
data.splice(i,1);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
data.push(regobj);
|
||||||
|
} else {
|
||||||
|
data = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(data == null) {
|
||||||
|
data = [regobj];
|
||||||
|
}
|
||||||
|
localStorage.setItem('u2fregistration', JSON.stringify(data));
|
||||||
|
}
|
||||||
|
<?php
|
||||||
|
function fixupArray($data) {
|
||||||
|
$ret = array();
|
||||||
|
$decoded = json_decode($data);
|
||||||
|
foreach ($decoded as $d) {
|
||||||
|
$ret[] = json_encode($d);
|
||||||
|
}
|
||||||
|
return $ret;
|
||||||
|
}
|
||||||
|
if($_SERVER['REQUEST_METHOD'] === 'POST') {
|
||||||
|
if(isset($_POST['startRegister'])) {
|
||||||
|
$regs = json_decode($_POST['registrations']) ? : array();
|
||||||
|
list($data, $reqs) = $u2f->getRegisterData($regs);
|
||||||
|
echo "var request = " . json_encode($data) . ";\n";
|
||||||
|
echo "var signs = " . json_encode($reqs) . ";\n";
|
||||||
|
?>
|
||||||
|
setTimeout(function() {
|
||||||
|
console.log("Register: ", request);
|
||||||
|
u2f.register([request], signs, function(data) {
|
||||||
|
var form = document.getElementById('form');
|
||||||
|
var reg = document.getElementById('doRegister');
|
||||||
|
var req = document.getElementById('request');
|
||||||
|
console.log("Register callback", data);
|
||||||
|
if(data.errorCode && data.errorCode != 0) {
|
||||||
|
alert("registration failed with errror: " + data.errorCode);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
reg.value=JSON.stringify(data);
|
||||||
|
req.value=JSON.stringify(request);
|
||||||
|
form.submit();
|
||||||
|
});
|
||||||
|
}, 1000);
|
||||||
|
<?php
|
||||||
|
} else if($_POST['doRegister']) {
|
||||||
|
try {
|
||||||
|
$data = $u2f->doRegister(json_decode($_POST['request']), json_decode($_POST['doRegister']));
|
||||||
|
echo "var registration = '" . json_encode($data) . "';\n";
|
||||||
|
?>
|
||||||
|
addRegistration(registration);
|
||||||
|
alert("registration successful!");
|
||||||
|
<?php
|
||||||
|
} catch(u2flib_server\Error $e) {
|
||||||
|
echo "alert('error:" . $e->getMessage() . "');\n";
|
||||||
|
}
|
||||||
|
} else if(isset($_POST['startAuthenticate'])) {
|
||||||
|
$regs = json_decode($_POST['registrations']);
|
||||||
|
$data = $u2f->getAuthenticateData($regs);
|
||||||
|
echo "var registrations = " . $_POST['registrations'] . ";\n";
|
||||||
|
echo "var request = " . json_encode($data) . ";\n";
|
||||||
|
?>
|
||||||
|
setTimeout(function() {
|
||||||
|
console.log("sign: ", request);
|
||||||
|
u2f.sign(request, function(data) {
|
||||||
|
var form = document.getElementById('form');
|
||||||
|
var reg = document.getElementById('doAuthenticate');
|
||||||
|
var req = document.getElementById('request');
|
||||||
|
var regs = document.getElementById('registrations');
|
||||||
|
console.log("Authenticate callback", data);
|
||||||
|
reg.value=JSON.stringify(data);
|
||||||
|
req.value=JSON.stringify(request);
|
||||||
|
regs.value=JSON.stringify(registrations);
|
||||||
|
form.submit();
|
||||||
|
});
|
||||||
|
}, 1000);
|
||||||
|
<?php
|
||||||
|
} else if($_POST['doAuthenticate']) {
|
||||||
|
$reqs = json_decode($_POST['request']);
|
||||||
|
$regs = json_decode($_POST['registrations']);
|
||||||
|
try {
|
||||||
|
$data = $u2f->doAuthenticate($reqs, $regs, json_decode($_POST['doAuthenticate']));
|
||||||
|
echo "var registration = '" . json_encode($data) . "';\n";
|
||||||
|
echo "addRegistration(registration);\n";
|
||||||
|
echo "alert('Authentication successful, counter:" . $data->counter . "');\n";
|
||||||
|
} catch(u2flib_server\Error $e) {
|
||||||
|
echo "alert('error:" . $e->getMessage() . "');\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
</script>
|
||||||
|
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<form method="POST" id="form">
|
||||||
|
<button name="startRegister" type="submit">Register</button>
|
||||||
|
<input type="hidden" name="doRegister" id="doRegister"/>
|
||||||
|
<button name="startAuthenticate" type="submit" id="startAuthenticate">Authenticate</button>
|
||||||
|
<input type="hidden" name="doAuthenticate" id="doAuthenticate"/>
|
||||||
|
<input type="hidden" name="request" id="request"/>
|
||||||
|
<input type="hidden" name="registrations" id="registrations"/>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
<span id="registered">0</span> Authenticators currently registered.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
var reg = localStorage.getItem('u2fregistration');
|
||||||
|
var auth = document.getElementById('startAuthenticate');
|
||||||
|
if(reg == null) {
|
||||||
|
auth.disabled = true;
|
||||||
|
} else {
|
||||||
|
var regs = document.getElementById('registrations');
|
||||||
|
decoded = JSON.parse(reg);
|
||||||
|
if(!Array.isArray(decoded)) {
|
||||||
|
auth.disabled = true;
|
||||||
|
} else {
|
||||||
|
regs.value = reg;
|
||||||
|
console.log("set the registrations to : ", reg);
|
||||||
|
var regged = document.getElementById('registered');
|
||||||
|
regged.innerHTML = decoded.length;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
@ -0,0 +1,204 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Copyright (c) 2014 Yubico AB
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are
|
||||||
|
* met:
|
||||||
|
*
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* * Redistributions in binary form must reproduce the above
|
||||||
|
* copyright notice, this list of conditions and the following
|
||||||
|
* disclaimer in the documentation and/or other materials provided
|
||||||
|
* with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This is a simple example using PDO and a sqlite database for storing
|
||||||
|
* registrations. It supports multiple registrations associated with each user.
|
||||||
|
*/
|
||||||
|
|
||||||
|
require_once('../../src/u2flib_server/U2F.php');
|
||||||
|
|
||||||
|
$dbfile = '/var/tmp/u2f-pdo.sqlite';
|
||||||
|
|
||||||
|
$pdo = new PDO("sqlite:$dbfile");
|
||||||
|
$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
|
||||||
|
$pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
|
||||||
|
|
||||||
|
$pdo->exec("create table if not exists users (id integer primary key, name varchar(255))");
|
||||||
|
$pdo->exec("create table if not exists registrations (id integer primary key, user_id integer, keyHandle varchar(255), publicKey varchar(255), certificate text, counter integer)");
|
||||||
|
|
||||||
|
$scheme = isset($_SERVER['HTTPS']) ? "https://" : "http://";
|
||||||
|
$u2f = new u2flib_server\U2F($scheme . $_SERVER['HTTP_HOST']);
|
||||||
|
|
||||||
|
session_start();
|
||||||
|
|
||||||
|
function createAndGetUser($name) {
|
||||||
|
global $pdo;
|
||||||
|
$sel = $pdo->prepare("select * from users where name = ?");
|
||||||
|
$sel->execute(array($name));
|
||||||
|
$user = $sel->fetch();
|
||||||
|
if(!$user) {
|
||||||
|
$ins = $pdo->prepare("insert into users (name) values(?)");
|
||||||
|
$ins->execute(array($name));
|
||||||
|
$sel->execute(array($name));
|
||||||
|
$user = $sel->fetch();
|
||||||
|
}
|
||||||
|
return $user;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getRegs($user_id) {
|
||||||
|
global $pdo;
|
||||||
|
$sel = $pdo->prepare("select * from registrations where user_id = ?");
|
||||||
|
$sel->execute(array($user_id));
|
||||||
|
return $sel->fetchAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
function addReg($user_id, $reg) {
|
||||||
|
global $pdo;
|
||||||
|
$ins = $pdo->prepare("insert into registrations (user_id, keyHandle, publicKey, certificate, counter) values (?, ?, ?, ?, ?)");
|
||||||
|
$ins->execute(array($user_id, $reg->keyHandle, $reg->publicKey, $reg->certificate, $reg->counter));
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateReg($reg) {
|
||||||
|
global $pdo;
|
||||||
|
$upd = $pdo->prepare("update registrations set counter = ? where id = ?");
|
||||||
|
$upd->execute(array($reg->counter, $reg->id));
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
||||||
|
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>PHP U2F example</title>
|
||||||
|
|
||||||
|
<script src="../assets/u2f-api.js"></script>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
<?php
|
||||||
|
|
||||||
|
if($_SERVER['REQUEST_METHOD'] === 'POST') {
|
||||||
|
if(!$_POST['username']) {
|
||||||
|
echo "alert('no username provided!');";
|
||||||
|
} else if(!isset($_POST['action']) && !isset($_POST['register2']) && !isset($_POST['authenticate2'])) {
|
||||||
|
echo "alert('no action provided!');";
|
||||||
|
} else {
|
||||||
|
$user = createAndGetUser($_POST['username']);
|
||||||
|
|
||||||
|
if(isset($_POST['action'])) {
|
||||||
|
switch($_POST['action']):
|
||||||
|
case 'register':
|
||||||
|
try {
|
||||||
|
$data = $u2f->getRegisterData(getRegs($user->id));
|
||||||
|
|
||||||
|
list($req,$sigs) = $data;
|
||||||
|
$_SESSION['regReq'] = json_encode($req);
|
||||||
|
echo "var req = " . json_encode($req) . ";";
|
||||||
|
echo "var sigs = " . json_encode($sigs) . ";";
|
||||||
|
echo "var username = '" . $user->name . "';";
|
||||||
|
?>
|
||||||
|
setTimeout(function() {
|
||||||
|
console.log("Register: ", req);
|
||||||
|
u2f.register([req], sigs, function(data) {
|
||||||
|
var form = document.getElementById('form');
|
||||||
|
var reg = document.getElementById('register2');
|
||||||
|
var user = document.getElementById('username');
|
||||||
|
console.log("Register callback", data);
|
||||||
|
if(data.errorCode && errorCode != 0) {
|
||||||
|
alert("registration failed with errror: " + data.errorCode);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
reg.value = JSON.stringify(data);
|
||||||
|
user.value = username;
|
||||||
|
form.submit();
|
||||||
|
});
|
||||||
|
}, 1000);
|
||||||
|
<?php
|
||||||
|
} catch( Exception $e ) {
|
||||||
|
echo "alert('error: " . $e->getMessage() . "');";
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'authenticate':
|
||||||
|
try {
|
||||||
|
$reqs = json_encode($u2f->getAuthenticateData(getRegs($user->id)));
|
||||||
|
|
||||||
|
$_SESSION['authReq'] = $reqs;
|
||||||
|
echo "var req = $reqs;";
|
||||||
|
echo "var username = '" . $user->name . "';";
|
||||||
|
?>
|
||||||
|
setTimeout(function() {
|
||||||
|
console.log("sign: ", req);
|
||||||
|
u2f.sign(req, function(data) {
|
||||||
|
var form = document.getElementById('form');
|
||||||
|
var auth = document.getElementById('authenticate2');
|
||||||
|
var user = document.getElementById('username');
|
||||||
|
console.log("Authenticate callback", data);
|
||||||
|
auth.value=JSON.stringify(data);
|
||||||
|
user.value = username;
|
||||||
|
form.submit();
|
||||||
|
});
|
||||||
|
}, 1000);
|
||||||
|
<?php
|
||||||
|
} catch( Exception $e ) {
|
||||||
|
echo "alert('error: " . $e->getMessage() . "');";
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
|
||||||
|
endswitch;
|
||||||
|
} else if($_POST['register2']) {
|
||||||
|
try {
|
||||||
|
$reg = $u2f->doRegister(json_decode($_SESSION['regReq']), json_decode($_POST['register2']));
|
||||||
|
addReg($user->id, $reg);
|
||||||
|
} catch( Exception $e ) {
|
||||||
|
echo "alert('error: " . $e->getMessage() . "');";
|
||||||
|
} finally {
|
||||||
|
$_SESSION['regReq'] = null;
|
||||||
|
}
|
||||||
|
} else if($_POST['authenticate2']) {
|
||||||
|
try {
|
||||||
|
$reg = $u2f->doAuthenticate(json_decode($_SESSION['authReq']), getRegs($user->id), json_decode($_POST['authenticate2']));
|
||||||
|
updateReg($reg);
|
||||||
|
echo "alert('success: " . $reg->counter . "');";
|
||||||
|
} catch( Exception $e ) {
|
||||||
|
echo "alert('error: " . $e->getMessage() . "');";
|
||||||
|
} finally {
|
||||||
|
$_SESSION['authReq'] = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
</script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
|
||||||
|
<form method="POST" id="form">
|
||||||
|
username: <input name="username" id="username"/><br/>
|
||||||
|
register: <input value="register" name="action" type="radio"/><br/>
|
||||||
|
authenticate: <input value="authenticate" name="action" type="radio"/><br/>
|
||||||
|
<input type="hidden" name="register2" id="register2"/>
|
||||||
|
<input type="hidden" name="authenticate2" id="authenticate2"/>
|
||||||
|
<button type="submit">Submit!</button>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
<phpunit
|
||||||
|
colors="true">
|
||||||
|
<testsuite name="tests">
|
||||||
|
<directory suffix="test.php">.</directory>
|
||||||
|
</testsuite>
|
||||||
|
<logging>
|
||||||
|
<log type="coverage-clover" target="build/logs/clover.xml"/>
|
||||||
|
</logging>
|
||||||
|
</phpunit>
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
MIIDHjCCAgagAwIBAgIEG0BT9zANBgkqhkiG9w0BAQsFADAuMSwwKgYDVQQDEyNZ
|
||||||
|
dWJpY28gVTJGIFJvb3QgQ0EgU2VyaWFsIDQ1NzIwMDYzMTAgFw0xNDA4MDEwMDAw
|
||||||
|
MDBaGA8yMDUwMDkwNDAwMDAwMFowLjEsMCoGA1UEAxMjWXViaWNvIFUyRiBSb290
|
||||||
|
IENBIFNlcmlhbCA0NTcyMDA2MzEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
|
||||||
|
AoIBAQC/jwYuhBVlqaiYWEMsrWFisgJ+PtM91eSrpI4TK7U53mwCIawSDHy8vUmk
|
||||||
|
5N2KAj9abvT9NP5SMS1hQi3usxoYGonXQgfO6ZXyUA9a+KAkqdFnBnlyugSeCOep
|
||||||
|
8EdZFfsaRFtMjkwz5Gcz2Py4vIYvCdMHPtwaz0bVuzneueIEz6TnQjE63Rdt2zbw
|
||||||
|
nebwTG5ZybeWSwbzy+BJ34ZHcUhPAY89yJQXuE0IzMZFcEBbPNRbWECRKgjq//qT
|
||||||
|
9nmDOFVlSRCt2wiqPSzluwn+v+suQEBsUjTGMEd25tKXXTkNW21wIWbxeSyUoTXw
|
||||||
|
LvGS6xlwQSgNpk2qXYwf8iXg7VWZAgMBAAGjQjBAMB0GA1UdDgQWBBQgIvz0bNGJ
|
||||||
|
hjgpToksyKpP9xv9oDAPBgNVHRMECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAN
|
||||||
|
BgkqhkiG9w0BAQsFAAOCAQEAjvjuOMDSa+JXFCLyBKsycXtBVZsJ4Ue3LbaEsPY4
|
||||||
|
MYN/hIQ5ZM5p7EjfcnMG4CtYkNsfNHc0AhBLdq45rnT87q/6O3vUEtNMafbhU6kt
|
||||||
|
hX7Y+9XFN9NpmYxr+ekVY5xOxi8h9JDIgoMP4VB1uS0aunL1IGqrNooL9mmFnL2k
|
||||||
|
LVVee6/VR6C5+KSTCMCWppMuJIZII2v9o4dkoZ8Y7QRjQlLfYzd3qGtKbw7xaF1U
|
||||||
|
sG/5xUb/Btwb2X2g4InpiB/yt/3CpQXpiWX/K4mBvUKiGn05ZsqeY1gx4g0xLBqc
|
||||||
|
U9psmyPzK+Vsgw2jeRQ5JlKDyqE0hebfC1tvFu0CCrJFcw==
|
||||||
|
-----END CERTIFICATE-----
|
||||||
|
|
@ -0,0 +1,296 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Copyright (c) 2014 Yubico AB
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are
|
||||||
|
* met:
|
||||||
|
*
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* * Redistributions in binary form must reproduce the above
|
||||||
|
* copyright notice, this list of conditions and the following
|
||||||
|
* disclaimer in the documentation and/or other materials provided
|
||||||
|
* with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
require_once(__DIR__ . '/../src/u2flib_server/U2F.php');
|
||||||
|
|
||||||
|
class U2FTest extends \PHPUnit_Framework_TestCase {
|
||||||
|
/** @var u2flib_server\U2F */
|
||||||
|
private $u2f;
|
||||||
|
|
||||||
|
public function setUp() {
|
||||||
|
$this->u2f = new u2flib_server\U2F("http://demo.example.com");
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetRegisterData() {
|
||||||
|
list($reg, $signData) = $this->u2f->getRegisterData();
|
||||||
|
$this->assertJsonStringEqualsJsonString(json_encode(array()), json_encode($signData));
|
||||||
|
$this->assertEquals('U2F_V2', $reg->version);
|
||||||
|
$this->assertObjectHasAttribute('challenge', $reg);
|
||||||
|
$this->assertEquals('http://demo.example.com', $reg->appId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testDoRegister() {
|
||||||
|
$req = json_decode('{"version":"U2F_V2","challenge":"yKA0x075tjJ-GE7fKTfnzTOSaNUOWQxRd9TWz5aFOg8","appId":"http://demo.example.com"}');
|
||||||
|
$resp = json_decode('{ "registrationData": "BQQtEmhWVgvbh-8GpjsHbj_d5FB9iNoRL8mNEq34-ANufKWUpVdIj6BSB_m3eMoZ3GqnaDy3RA5eWP8mhTkT1Ht3QAk1GsmaPIQgXgvrBkCQoQtMFvmwYPfW5jpRgoMPFxquHS7MTt8lofZkWAK2caHD-YQQdaRBgd22yWIjPuWnHOcwggLiMIHLAgEBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBDQTAeFw0xNDA1MTUxMjU4NTRaFw0xNDA2MTQxMjU4NTRaMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBFRTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNsK2_Uhx1zOY9ym4eglBg2U5idUGU-dJK8mGr6tmUQflaNxkQo6IOc-kV4T6L44BXrVeqN-dpCPr-KKlLYw650wDQYJKoZIhvcNAQELBQADggIBAJVAa1Bhfa2Eo7TriA_jMA8togoA2SUE7nL6Z99YUQ8LRwKcPkEpSpOsKYWJLaR6gTIoV3EB76hCiBaWN5HV3-CPyTyNsM2JcILsedPGeHMpMuWrbL1Wn9VFkc7B3Y1k3OmcH1480q9RpYIYr-A35zKedgV3AnvmJKAxVhv9GcVx0_CewHMFTryFuFOe78W8nFajutknarupekDXR4tVcmvj_ihJcST0j_Qggeo4_3wKT98CgjmBgjvKCd3Kqg8n9aSDVWyaOZsVOhZj3Fv5rFu895--D4qiPDETozJIyliH-HugoQpqYJaTX10mnmMdCa6aQeW9CEf-5QmbIP0S4uZAf7pKYTNmDQ5z27DVopqaFw00MIVqQkae_zSPX4dsNeeoTTXrwUGqitLaGap5ol81LKD9JdP3nSUYLfq0vLsHNDyNgb306TfbOenRRVsgQS8tJyLcknSKktWD_Qn7E5vjOXprXPrmdp7g5OPvrbz9QkWa1JTRfo2n2AXV02LPFc-UfR9bWCBEIJBxvmbpmqt0MnBTHWnth2b0CU_KJTDCY3kAPLGbOT8A4KiI73pRW-e9SWTaQXskw3Ei_dHRILM_l9OXsqoYHJ4Dd3tbfvmjoNYggSw4j50l3unI9d1qR5xlBFpW5sLr8gKX4bnY4SR2nyNiOQNLyPc0B0nW502aMEUCIQDTGOX-i_QrffJDY8XvKbPwMuBVrOSO-ayvTnWs_WSuDQIgZ7fMAvD_Ezyy5jg6fQeuOkoJi8V2naCtzV-HTly8Nww=", "clientData": "eyAiY2hhbGxlbmdlIjogInlLQTB4MDc1dGpKLUdFN2ZLVGZuelRPU2FOVU9XUXhSZDlUV3o1YUZPZzgiLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5maW5pc2hFbnJvbGxtZW50IiB9", "errorCode": 0 }');
|
||||||
|
$reg = $this->u2f->doRegister($req, $resp);
|
||||||
|
$this->assertEquals('CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w', $reg->keyHandle);
|
||||||
|
$this->assertEquals('BC0SaFZWC9uH7wamOwduP93kUH2I2hEvyY0Srfj4A258pZSlV0iPoFIH+bd4yhncaqdoPLdEDl5Y/yaFORPUe3c=', $reg->publicKey);
|
||||||
|
$this->assertEquals('MIIC4jCBywIBATANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgQ0EwHhcNMTQwNTE1MTI1ODU0WhcNMTQwNjE0MTI1ODU0WjAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgRUUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATbCtv1IcdczmPcpuHoJQYNlOYnVBlPnSSvJhq+rZlEH5WjcZEKOiDnPpFeE+i+OAV61XqjfnaQj6/iipS2MOudMA0GCSqGSIb3DQEBCwUAA4ICAQCVQGtQYX2thKO064gP4zAPLaIKANklBO5y+mffWFEPC0cCnD5BKUqTrCmFiS2keoEyKFdxAe+oQogWljeR1d/gj8k8jbDNiXCC7HnTxnhzKTLlq2y9Vp/VRZHOwd2NZNzpnB9ePNKvUaWCGK/gN+cynnYFdwJ75iSgMVYb/RnFcdPwnsBzBU68hbhTnu/FvJxWo7rZJ2q7qXpA10eLVXJr4/4oSXEk9I/0IIHqOP98Ck/fAoI5gYI7ygndyqoPJ/Wkg1VsmjmbFToWY9xb+axbvPefvg+KojwxE6MySMpYh/h7oKEKamCWk19dJp5jHQmumkHlvQhH/uUJmyD9EuLmQH+6SmEzZg0Oc9uw1aKamhcNNDCFakJGnv80j1+HbDXnqE0168FBqorS2hmqeaJfNSyg/SXT950lGC36tLy7BzQ8jYG99Ok32znp0UVbIEEvLSci3JJ0ipLVg/0J+xOb4zl6a1z65nae4OTj7628/UJFmtSU0X6Np9gF1dNizxXPlH0fW1ggRCCQcb5m6ZqrdDJwUx1p7Ydm9AlPyiUwwmN5ADyxmzk/AOCoiO96UVvnvUlk2kF7JMNxIv3R0SCzP5fTl7KqGByeA3d7W375o6DWIIEsOI+dJd7pyPXdakecZQRaVubC6/ICl+G52OEkdp8jYjkDS8j3NAdJ1udNmg==', $reg->certificate);
|
||||||
|
$this->assertLessThan(0, $reg->counter);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testDoRegisterNoCert() {
|
||||||
|
$req = json_decode('{"version":"U2F_V2","challenge":"yKA0x075tjJ-GE7fKTfnzTOSaNUOWQxRd9TWz5aFOg8","appId":"http://demo.example.com"}');
|
||||||
|
$resp = json_decode('{ "registrationData": "BQQtEmhWVgvbh-8GpjsHbj_d5FB9iNoRL8mNEq34-ANufKWUpVdIj6BSB_m3eMoZ3GqnaDy3RA5eWP8mhTkT1Ht3QAk1GsmaPIQgXgvrBkCQoQtMFvmwYPfW5jpRgoMPFxquHS7MTt8lofZkWAK2caHD-YQQdaRBgd22yWIjPuWnHOcwggLiMIHLAgEBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBDQTAeFw0xNDA1MTUxMjU4NTRaFw0xNDA2MTQxMjU4NTRaMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBFRTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNsK2_Uhx1zOY9ym4eglBg2U5idUGU-dJK8mGr6tmUQflaNxkQo6IOc-kV4T6L44BXrVeqN-dpCPr-KKlLYw650wDQYJKoZIhvcNAQELBQADggIBAJVAa1Bhfa2Eo7TriA_jMA8togoA2SUE7nL6Z99YUQ8LRwKcPkEpSpOsKYWJLaR6gTIoV3EB76hCiBaWN5HV3-CPyTyNsM2JcILsedPGeHMpMuWrbL1Wn9VFkc7B3Y1k3OmcH1480q9RpYIYr-A35zKedgV3AnvmJKAxVhv9GcVx0_CewHMFTryFuFOe78W8nFajutknarupekDXR4tVcmvj_ihJcST0j_Qggeo4_3wKT98CgjmBgjvKCd3Kqg8n9aSDVWyaOZsVOhZj3Fv5rFu895--D4qiPDETozJIyliH-HugoQpqYJaTX10mnmMdCa6aQeW9CEf-5QmbIP0S4uZAf7pKYTNmDQ5z27DVopqaFw00MIVqQkae_zSPX4dsNeeoTTXrwUGqitLaGap5ol81LKD9JdP3nSUYLfq0vLsHNDyNgb306TfbOenRRVsgQS8tJyLcknSKktWD_Qn7E5vjOXprXPrmdp7g5OPvrbz9QkWa1JTRfo2n2AXV02LPFc-UfR9bWCBEIJBxvmbpmqt0MnBTHWnth2b0CU_KJTDCY3kAPLGbOT8A4KiI73pRW-e9SWTaQXskw3Ei_dHRILM_l9OXsqoYHJ4Dd3tbfvmjoNYggSw4j50l3unI9d1qR5xlBFpW5sLr8gKX4bnY4SR2nyNiOQNLyPc0B0nW502aMEUCIQDTGOX-i_QrffJDY8XvKbPwMuBVrOSO-ayvTnWs_WSuDQIgZ7fMAvD_Ezyy5jg6fQeuOkoJi8V2naCtzV-HTly8Nww=", "clientData": "eyAiY2hhbGxlbmdlIjogInlLQTB4MDc1dGpKLUdFN2ZLVGZuelRPU2FOVU9XUXhSZDlUV3o1YUZPZzgiLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5maW5pc2hFbnJvbGxtZW50IiB9" }');
|
||||||
|
$reg = $this->u2f->doRegister($req, $resp, false);
|
||||||
|
$this->assertEquals('CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w', $reg->keyHandle);
|
||||||
|
$this->assertEquals('BC0SaFZWC9uH7wamOwduP93kUH2I2hEvyY0Srfj4A258pZSlV0iPoFIH+bd4yhncaqdoPLdEDl5Y/yaFORPUe3c=', $reg->publicKey);
|
||||||
|
$this->assertEquals('', $reg->certificate);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException u2flib_server\Error
|
||||||
|
* @expectedExceptionCode u2flib_server\ERR_ATTESTATION_VERIFICATION
|
||||||
|
*/
|
||||||
|
public function testDoRegisterAttestFail() {
|
||||||
|
$this->u2f = new u2flib_server\U2F("http://demo.example.com", __DIR__ . "/../tests/certs");
|
||||||
|
$req = json_decode('{"version":"U2F_V2","challenge":"yKA0x075tjJ-GE7fKTfnzTOSaNUOWQxRd9TWz5aFOg8","appId":"http://demo.example.com"}');
|
||||||
|
$resp = json_decode('{ "registrationData": "BQQtEmhWVgvbh-8GpjsHbj_d5FB9iNoRL8mNEq34-ANufKWUpVdIj6BSB_m3eMoZ3GqnaDy3RA5eWP8mhTkT1Ht3QAk1GsmaPIQgXgvrBkCQoQtMFvmwYPfW5jpRgoMPFxquHS7MTt8lofZkWAK2caHD-YQQdaRBgd22yWIjPuWnHOcwggLiMIHLAgEBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBDQTAeFw0xNDA1MTUxMjU4NTRaFw0xNDA2MTQxMjU4NTRaMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBFRTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNsK2_Uhx1zOY9ym4eglBg2U5idUGU-dJK8mGr6tmUQflaNxkQo6IOc-kV4T6L44BXrVeqN-dpCPr-KKlLYw650wDQYJKoZIhvcNAQELBQADggIBAJVAa1Bhfa2Eo7TriA_jMA8togoA2SUE7nL6Z99YUQ8LRwKcPkEpSpOsKYWJLaR6gTIoV3EB76hCiBaWN5HV3-CPyTyNsM2JcILsedPGeHMpMuWrbL1Wn9VFkc7B3Y1k3OmcH1480q9RpYIYr-A35zKedgV3AnvmJKAxVhv9GcVx0_CewHMFTryFuFOe78W8nFajutknarupekDXR4tVcmvj_ihJcST0j_Qggeo4_3wKT98CgjmBgjvKCd3Kqg8n9aSDVWyaOZsVOhZj3Fv5rFu895--D4qiPDETozJIyliH-HugoQpqYJaTX10mnmMdCa6aQeW9CEf-5QmbIP0S4uZAf7pKYTNmDQ5z27DVopqaFw00MIVqQkae_zSPX4dsNeeoTTXrwUGqitLaGap5ol81LKD9JdP3nSUYLfq0vLsHNDyNgb306TfbOenRRVsgQS8tJyLcknSKktWD_Qn7E5vjOXprXPrmdp7g5OPvrbz9QkWa1JTRfo2n2AXV02LPFc-UfR9bWCBEIJBxvmbpmqt0MnBTHWnth2b0CU_KJTDCY3kAPLGbOT8A4KiI73pRW-e9SWTaQXskw3Ei_dHRILM_l9OXsqoYHJ4Dd3tbfvmjoNYggSw4j50l3unI9d1qR5xlBFpW5sLr8gKX4bnY4SR2nyNiOQNLyPc0B0nW502aMEUCIQDTGOX-i_QrffJDY8XvKbPwMuBVrOSO-ayvTnWs_WSuDQIgZ7fMAvD_Ezyy5jg6fQeuOkoJi8V2naCtzV-HTly8Nww=", "clientData": "eyAiY2hhbGxlbmdlIjogInlLQTB4MDc1dGpKLUdFN2ZLVGZuelRPU2FOVU9XUXhSZDlUV3o1YUZPZzgiLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5maW5pc2hFbnJvbGxtZW50IiB9" }');
|
||||||
|
$this->u2f->doRegister($req, $resp, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException u2flib_server\Error
|
||||||
|
* @expectedExceptionCode u2flib_server\ERR_ATTESTATION_SIGNATURE
|
||||||
|
*/
|
||||||
|
public function testDoRegisterFail2() {
|
||||||
|
$req = json_decode('{"version":"U2F_V2","challenge":"yKA0x075tjJ-GE7fKTfnzTOSaNUOWQxRd9TWz5aFOg8","appId":"http://demo.example.com"}');
|
||||||
|
$resp = json_decode('{ "registrationData": "BQQtEmhWVgvbh-8GpjsHbj_d5FB9iNoRL8mNEq34-ANufKWUpVdIj6BSB_m3eMoZ3GqnaDy3RA5eWP8mhTkT1Ht3QAk1GsmaPIQgXgvrBkCQoQtMFvmwYPfW5jpRgoMPFxquHS7MTt8lofZkWAK2caHD-YQQdaRBgd22yWIjPuWnHOcwggLiMIHLAgEBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBDQTAeFw0xNDA1MTUxMjU4NTRaFw0xNDA2MTQxMjU4NTRaMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBFRTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNsK2_Uhx1zOY9ym4eglBg2U5idUGU-dJK8mGr6tmUQflaNxkQo6IOc-kV4T6L44BXrVeqN-dpCPr-KKlLYw650wDQYJKoZIhvcNAQELBQADggIBAJVAa1Bhfa2Eo7TriA_jMA8togoA2SUE7nL6Z99YUQ8LRwKcPkEpSpOsKYWJLaR6gTIoV3EB76hCiBaWN5HV3-CPyTyNsM2JcILsedPGeHMpMuWrbL1Wn9VFkc7B3Y1k3OmcH1480q9RpYIYr-A35zKedgV3AnvmJKAxVhv9GcVx0_CewHMFTryFuFOe78W8nFajutknarupekDXR4tVcmvj_ihJcST0j_Qggeo4_3wKT98CgjmBgjvKCd3Kqg8n9aSDVWyaOZsVOhZj3Fv5rFu895--D4qiPDETozJIyliH-HugoQpqYJaTX10mnmMdCa6aQeW9CEf-5QmbIP0S4uZAf7pKYTNmDQ5z27DVopqaFw00MIVqQkae_zSPX4dsNeeoTTXrwUGqitLaGap5ol81LKD9JdP3nSUYLfq0vLsHNDyNgb306TfbOenRRVsgQS8tJyLcknSKktWD_Qn7E5vjOXprXPrmdp7g5OPvrbz9QkWa1JTRfo2n2AXV02LPFc-UfR9bWCBEIJBxvmbpmqt0MnBTHWnth2b0CU_KJTDCY3kAPLGbOT8A4KiI73pRW-e9SWTaQXskw3Ei_dHRILM_l9OXsqoYHJ4Dd3tbfvmjoNYggSw4j50l3unI9d1qR5xlBFpW5sLr8gKX4bnY4SR2nyNiOQNLyPc0B0nW502aMEUCIQDTGOX-i_QrffJDY8XvKbPwMuBVrOSO-ayvTnWs_WSuDQIgZ7fMAvD_Ezyy5jg6fQeuOkoJi8V2naCtzV-HTly8NwW=", "clientData": "eyAiY2hhbGxlbmdlIjogInlLQTB4MDc1dGpKLUdFN2ZLVGZuelRPU2FOVU9XUXhSZDlUV3o1YUZPZzgiLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5maW5pc2hFbnJvbGxtZW50IiB9" }');
|
||||||
|
$this->u2f->doRegister($req, $resp, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException u2flib_server\Error
|
||||||
|
* @expectedExceptionCode u2flib_server\ERR_UNMATCHED_CHALLENGE
|
||||||
|
*/
|
||||||
|
public function testDoRegisterFail() {
|
||||||
|
$req = json_decode('{"version":"U2F_V2","challenge":"YKA0X075tjJ-GE7fKTfnzTOSaNUOWQxRd9TWz5aFOg8","appId":"http://demo.example.com"}');
|
||||||
|
$resp = json_decode('{ "registrationData": "BQQtEmhWVgvbh-8GpjsHbj_d5FB9iNoRL8mNEq34-ANufKWUpVdIj6BSB_m3eMoZ3GqnaDy3RA5eWP8mhTkT1Ht3QAk1GsmaPIQgXgvrBkCQoQtMFvmwYPfW5jpRgoMPFxquHS7MTt8lofZkWAK2caHD-YQQdaRBgd22yWIjPuWnHOcwggLiMIHLAgEBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBDQTAeFw0xNDA1MTUxMjU4NTRaFw0xNDA2MTQxMjU4NTRaMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBFRTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNsK2_Uhx1zOY9ym4eglBg2U5idUGU-dJK8mGr6tmUQflaNxkQo6IOc-kV4T6L44BXrVeqN-dpCPr-KKlLYw650wDQYJKoZIhvcNAQELBQADggIBAJVAa1Bhfa2Eo7TriA_jMA8togoA2SUE7nL6Z99YUQ8LRwKcPkEpSpOsKYWJLaR6gTIoV3EB76hCiBaWN5HV3-CPyTyNsM2JcILsedPGeHMpMuWrbL1Wn9VFkc7B3Y1k3OmcH1480q9RpYIYr-A35zKedgV3AnvmJKAxVhv9GcVx0_CewHMFTryFuFOe78W8nFajutknarupekDXR4tVcmvj_ihJcST0j_Qggeo4_3wKT98CgjmBgjvKCd3Kqg8n9aSDVWyaOZsVOhZj3Fv5rFu895--D4qiPDETozJIyliH-HugoQpqYJaTX10mnmMdCa6aQeW9CEf-5QmbIP0S4uZAf7pKYTNmDQ5z27DVopqaFw00MIVqQkae_zSPX4dsNeeoTTXrwUGqitLaGap5ol81LKD9JdP3nSUYLfq0vLsHNDyNgb306TfbOenRRVsgQS8tJyLcknSKktWD_Qn7E5vjOXprXPrmdp7g5OPvrbz9QkWa1JTRfo2n2AXV02LPFc-UfR9bWCBEIJBxvmbpmqt0MnBTHWnth2b0CU_KJTDCY3kAPLGbOT8A4KiI73pRW-e9SWTaQXskw3Ei_dHRILM_l9OXsqoYHJ4Dd3tbfvmjoNYggSw4j50l3unI9d1qR5xlBFpW5sLr8gKX4bnY4SR2nyNiOQNLyPc0B0nW502aMEUCIQDTGOX-i_QrffJDY8XvKbPwMuBVrOSO-ayvTnWs_WSuDQIgZ7fMAvD_Ezyy5jg6fQeuOkoJi8V2naCtzV-HTly8Nww=", "clientData": "eyAiY2hhbGxlbmdlIjogInlLQTB4MDc1dGpKLUdFN2ZLVGZuelRPU2FOVU9XUXhSZDlUV3o1YUZPZzgiLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5maW5pc2hFbnJvbGxtZW50IiB9" }');
|
||||||
|
$this->u2f->doRegister($req, $resp, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testDoRegisterAttest() {
|
||||||
|
$this->u2f = new u2flib_server\U2F("http://demo.example.com", __DIR__ . "/../tests/certs");
|
||||||
|
$req = json_decode('{"version":"U2F_V2","challenge":"5CBRhGBb2CXSum71GNREBGft7yz9g1jZO7JTkHGFsVY","appId":"http:\/\/demo.example.com"}');
|
||||||
|
$resp = json_decode('{ "registrationData": "BQRX1gfcG-ofTlk9rjB9spsIMrmT9ba0DLto5fzk8FDB05ModNU2sWAqoQRemYiUrILQdbNGpN_aHA0_oq8kcd_XQCK-Ut0PWaOtz43t0aAV04U788e-dvpeqLtHxtINjgmutKM8_GJQ7F-3W0dogUjSANuRYRdkkSEHPcVdLSkpyfowggIbMIIBBaADAgECAgRAxBIlMAsGCSqGSIb3DQEBCzAuMSwwKgYDVQQDEyNZdWJpY28gVTJGIFJvb3QgQ0EgU2VyaWFsIDQ1NzIwMDYzMTAgFw0xNDA4MDEwMDAwMDBaGA8yMDUwMDkwNDAwMDAwMFowKjEoMCYGA1UEAwwfWXViaWNvIFUyRiBFRSBTZXJpYWwgMTA4NjU5MTUyNTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABK2iSVV7KGNEdPE-oHGvobNnHVw6ZZ6vB3jNIYB1C4t32OucHzMweHqM5CAMSMDHtfp1vuJYaiQSk7jb6M48WtejEjAQMA4GCisGAQQBgsQKAQEEADALBgkqhkiG9w0BAQsDggEBAVg0BoEHEEp4LJLYPYFACRGS8WZiXkCA8crYLgGnzvfKXwPwyKJlUzYxxv5xoRrl5zjkIUXhZ4mnHZVsnj9EY_VGDuRRzKX7YtxTZpFZn7ej3abjLhckTkkQ_AhUkmP7VuK2AWLgYsS8ejGUqughBsKvh_84uxTAEr5BS-OGg2yi7UIjd8W0nOCc6EN8d_8wCiPOjt2Y_-TKpLLTXKszk4UnWNzRdxBThmBBprJBZbF1VyVRvJm5yRLBpth3G8KMvrt4Nu3Ecoj_Q154IJpWe1Dp1upDFLOG9nWCRQk25Y264k9BDISfqs-wHvUjIo2iDnKl5UVoauTWaT7M6KuEwl4wRAIgYUVjS_yTwJAtF35glSbf9Et-5tJzlHOeAqmbACd6pwsCIE0MkTR5XNQoO4XqDaUZCXmadWu8yU1gfE7AJI9JUUcc", "clientData": "eyAiY2hhbGxlbmdlIjogIjVDQlJoR0JiMkNYU3VtNzFHTlJFQkdmdDd5ejlnMWpaTzdKVGtIR0ZzVlkiLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5maW5pc2hFbnJvbGxtZW50IiB9" }');
|
||||||
|
$reg = $this->u2f->doRegister($req, $resp, true);
|
||||||
|
$this->assertEquals('Ir5S3Q9Zo63Pje3RoBXThTvzx752-l6ou0fG0g2OCa60ozz8YlDsX7dbR2iBSNIA25FhF2SRIQc9xV0tKSnJ-g', $reg->keyHandle);
|
||||||
|
$this->assertEquals('BFfWB9wb6h9OWT2uMH2ymwgyuZP1trQMu2jl/OTwUMHTkyh01TaxYCqhBF6ZiJSsgtB1s0ak39ocDT+iryRx39c=', $reg->publicKey);
|
||||||
|
$this->assertEquals('MIICGzCCAQWgAwIBAgIEQMQSJTALBgkqhkiG9w0BAQswLjEsMCoGA1UEAxMjWXViaWNvIFUyRiBSb290IENBIFNlcmlhbCA0NTcyMDA2MzEwIBcNMTQwODAxMDAwMDAwWhgPMjA1MDA5MDQwMDAwMDBaMCoxKDAmBgNVBAMMH1l1YmljbyBVMkYgRUUgU2VyaWFsIDEwODY1OTE1MjUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAStoklVeyhjRHTxPqBxr6GzZx1cOmWerwd4zSGAdQuLd9jrnB8zMHh6jOQgDEjAx7X6db7iWGokEpO42+jOPFrXoxIwEDAOBgorBgEEAYLECgEBBAAwCwYJKoZIhvcNAQELA4IBAQBYNAaBBxBKeCyS2D2BQAkRkvFmYl5AgPHK2C4Bp873yl8D8MiiZVM2Mcb+caEa5ec45CFF4WeJpx2VbJ4/RGP1Rg7kUcyl+2LcU2aRWZ+3o92m4y4XJE5JEPwIVJJj+1bitgFi4GLEvHoxlKroIQbCr4f/OLsUwBK+QUvjhoNsou1CI3fFtJzgnOhDfHf/MAojzo7dmP/kyqSy01yrM5OFJ1jc0XcQU4ZgQaayQWWxdVclUbyZuckSwabYdxvCjL67eDbtxHKI/0NeeCCaVntQ6dbqQxSzhvZ1gkUJNuWNuuJPQQyEn6rPsB71IyKNog5ypeVFaGrk1mk+zOirhMJe', $reg->certificate);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException u2flib_server\Error
|
||||||
|
* @expectedExceptionCode u2flib_server\ERR_PUBKEY_DECODE
|
||||||
|
*/
|
||||||
|
public function testDoRegisterBadKeyInCert() {
|
||||||
|
$req = json_decode('{"version":"U2F_V2","challenge":"yKA0x075tjJ-GE7fKTfnzTOSaNUOWQxRd9TWz5aFOg8","appId":"http://demo.example.com"}');
|
||||||
|
$resp = json_decode('{ "registrationData": "BQQtEmhWVgvbh-8GpjsHbj_d5FB9iNoRL8mNEq34-ANufKWUpVdIj6BSB_m3eMoZ3GqnaDy3RA5eWP8mhTkT1Ht3QAk1GsmaPIQgXgvrBkCQoQtMFvmwYPfW5jpRgoMPFxquHS7MTt8lofZkWAK2caHD-YQQdaRBgd22yWIjPuWnHOcwggLiMIHLAgEBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBDQTAeFw0xNDA1MTUxMjU4NTRaFw0xNDA2MTQxMjU4NTRaMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBFRTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABdsK2_Uhx1zOY9ym4eglBg2U5idUGU-dJK8mGr6tmUQflaNxkQo6IOc-kV4T6L44BXrVeqN-dpCPr-KKlLYw650wDQYJKoZIhvcNAQELBQADggIBAJVAa1Bhfa2Eo7TriA_jMA8togoA2SUE7nL6Z99YUQ8LRwKcPkEpSpOsKYWJLaR6gTIoV3EB76hCiBaWN5HV3-CPyTyNsM2JcILsedPGeHMpMuWrbL1Wn9VFkc7B3Y1k3OmcH1480q9RpYIYr-A35zKedgV3AnvmJKAxVhv9GcVx0_CewHMFTryFuFOe78W8nFajutknarupekDXR4tVcmvj_ihJcST0j_Qggeo4_3wKT98CgjmBgjvKCd3Kqg8n9aSDVWyaOZsVOhZj3Fv5rFu895--D4qiPDETozJIyliH-HugoQpqYJaTX10mnmMdCa6aQeW9CEf-5QmbIP0S4uZAf7pKYTNmDQ5z27DVopqaFw00MIVqQkae_zSPX4dsNeeoTTXrwUGqitLaGap5ol81LKD9JdP3nSUYLfq0vLsHNDyNgb306TfbOenRRVsgQS8tJyLcknSKktWD_Qn7E5vjOXprXPrmdp7g5OPvrbz9QkWa1JTRfo2n2AXV02LPFc-UfR9bWCBEIJBxvmbpmqt0MnBTHWnth2b0CU_KJTDCY3kAPLGbOT8A4KiI73pRW-e9SWTaQXskw3Ei_dHRILM_l9OXsqoYHJ4Dd3tbfvmjoNYggSw4j50l3unI9d1qR5xlBFpW5sLr8gKX4bnY4SR2nyNiOQNLyPc0B0nW502aMEUCIQDTGOX-i_QrffJDY8XvKbPwMuBVrOSO-ayvTnWs_WSuDQIgZ7fMAvD_Ezyy5jg6fQeuOkoJi8V2naCtzV-HTly8Nww=", "clientData": "eyAiY2hhbGxlbmdlIjogInlLQTB4MDc1dGpKLUdFN2ZLVGZuelRPU2FOVU9XUXhSZDlUV3o1YUZPZzgiLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5maW5pc2hFbnJvbGxtZW50IiB9" }');
|
||||||
|
$this->u2f->doRegister($req, $resp);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException u2flib_server\Error
|
||||||
|
* @expectedExceptionCode u2flib_server\ERR_PUBKEY_DECODE
|
||||||
|
*/
|
||||||
|
public function testDoRegisterBadKey() {
|
||||||
|
$req = json_decode('{"version":"U2F_V2","challenge":"yKA0x075tjJ-GE7fKTfnzTOSaNUOWQxRd9TWz5aFOg8","appId":"http://demo.example.com"}');
|
||||||
|
$resp = json_decode('{ "registrationData": "BQMtEmhWVgvbh-8GpjsHbj_d5FB9iNoRL8mNEq34-ANufKWUpVdIj6BSB_m3eMoZ3GqnaDy3RA5eWP8mhTkT1Ht3QAk1GsmaPIQgXgvrBkCQoQtMFvmwYPfW5jpRgoMPFxquHS7MTt8lofZkWAK2caHD-YQQdaRBgd22yWIjPuWnHOcwggLiMIHLAgEBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBDQTAeFw0xNDA1MTUxMjU4NTRaFw0xNDA2MTQxMjU4NTRaMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBFRTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNsK2_Uhx1zOY9ym4eglBg2U5idUGU-dJK8mGr6tmUQflaNxkQo6IOc-kV4T6L44BXrVeqN-dpCPr-KKlLYw650wDQYJKoZIhvcNAQELBQADggIBAJVAa1Bhfa2Eo7TriA_jMA8togoA2SUE7nL6Z99YUQ8LRwKcPkEpSpOsKYWJLaR6gTIoV3EB76hCiBaWN5HV3-CPyTyNsM2JcILsedPGeHMpMuWrbL1Wn9VFkc7B3Y1k3OmcH1480q9RpYIYr-A35zKedgV3AnvmJKAxVhv9GcVx0_CewHMFTryFuFOe78W8nFajutknarupekDXR4tVcmvj_ihJcST0j_Qggeo4_3wKT98CgjmBgjvKCd3Kqg8n9aSDVWyaOZsVOhZj3Fv5rFu895--D4qiPDETozJIyliH-HugoQpqYJaTX10mnmMdCa6aQeW9CEf-5QmbIP0S4uZAf7pKYTNmDQ5z27DVopqaFw00MIVqQkae_zSPX4dsNeeoTTXrwUGqitLaGap5ol81LKD9JdP3nSUYLfq0vLsHNDyNgb306TfbOenRRVsgQS8tJyLcknSKktWD_Qn7E5vjOXprXPrmdp7g5OPvrbz9QkWa1JTRfo2n2AXV02LPFc-UfR9bWCBEIJBxvmbpmqt0MnBTHWnth2b0CU_KJTDCY3kAPLGbOT8A4KiI73pRW-e9SWTaQXskw3Ei_dHRILM_l9OXsqoYHJ4Dd3tbfvmjoNYggSw4j50l3unI9d1qR5xlBFpW5sLr8gKX4bnY4SR2nyNiOQNLyPc0B0nW502aMEUCIQDTGOX-i_QrffJDY8XvKbPwMuBVrOSO-ayvTnWs_WSuDQIgZ7fMAvD_Ezyy5jg6fQeuOkoJi8V2naCtzV-HTly8Nww=", "clientData": "eyAiY2hhbGxlbmdlIjogInlLQTB4MDc1dGpKLUdFN2ZLVGZuelRPU2FOVU9XUXhSZDlUV3o1YUZPZzgiLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5maW5pc2hFbnJvbGxtZW50IiB9" }');
|
||||||
|
$this->u2f->doRegister($req, $resp);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \InvalidArgumentException
|
||||||
|
* @expectedExceptionMessage $request of doRegister() method only accepts object.
|
||||||
|
*/
|
||||||
|
public function testDoRegisterInvalidRequest() {
|
||||||
|
$req = 'request';
|
||||||
|
$resp = json_decode('{ "registrationData": "BQQtEmhWVgvbh-8GpjsHbj_d5FB9iNoRL8mNEq34-ANufKWUpVdIj6BSB_m3eMoZ3GqnaDy3RA5eWP8mhTkT1Ht3QAk1GsmaPIQgXgvrBkCQoQtMFvmwYPfW5jpRgoMPFxquHS7MTt8lofZkWAK2caHD-YQQdaRBgd22yWIjPuWnHOcwggLiMIHLAgEBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBDQTAeFw0xNDA1MTUxMjU4NTRaFw0xNDA2MTQxMjU4NTRaMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBFRTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNsK2_Uhx1zOY9ym4eglBg2U5idUGU-dJK8mGr6tmUQflaNxkQo6IOc-kV4T6L44BXrVeqN-dpCPr-KKlLYw650wDQYJKoZIhvcNAQELBQADggIBAJVAa1Bhfa2Eo7TriA_jMA8togoA2SUE7nL6Z99YUQ8LRwKcPkEpSpOsKYWJLaR6gTIoV3EB76hCiBaWN5HV3-CPyTyNsM2JcILsedPGeHMpMuWrbL1Wn9VFkc7B3Y1k3OmcH1480q9RpYIYr-A35zKedgV3AnvmJKAxVhv9GcVx0_CewHMFTryFuFOe78W8nFajutknarupekDXR4tVcmvj_ihJcST0j_Qggeo4_3wKT98CgjmBgjvKCd3Kqg8n9aSDVWyaOZsVOhZj3Fv5rFu895--D4qiPDETozJIyliH-HugoQpqYJaTX10mnmMdCa6aQeW9CEf-5QmbIP0S4uZAf7pKYTNmDQ5z27DVopqaFw00MIVqQkae_zSPX4dsNeeoTTXrwUGqitLaGap5ol81LKD9JdP3nSUYLfq0vLsHNDyNgb306TfbOenRRVsgQS8tJyLcknSKktWD_Qn7E5vjOXprXPrmdp7g5OPvrbz9QkWa1JTRfo2n2AXV02LPFc-UfR9bWCBEIJBxvmbpmqt0MnBTHWnth2b0CU_KJTDCY3kAPLGbOT8A4KiI73pRW-e9SWTaQXskw3Ei_dHRILM_l9OXsqoYHJ4Dd3tbfvmjoNYggSw4j50l3unI9d1qR5xlBFpW5sLr8gKX4bnY4SR2nyNiOQNLyPc0B0nW502aMEUCIQDTGOX-i_QrffJDY8XvKbPwMuBVrOSO-ayvTnWs_WSuDQIgZ7fMAvD_Ezyy5jg6fQeuOkoJi8V2naCtzV-HTly8Nww=", "clientData": "eyAiY2hhbGxlbmdlIjogInlLQTB4MDc1dGpKLUdFN2ZLVGZuelRPU2FOVU9XUXhSZDlUV3o1YUZPZzgiLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5maW5pc2hFbnJvbGxtZW50IiB9" }');
|
||||||
|
$this->u2f->doRegister($req, $resp);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \InvalidArgumentException
|
||||||
|
* @expectedExceptionMessage $response of doRegister() method only accepts object.
|
||||||
|
*/
|
||||||
|
public function testDoRegisterInvalidResponse() {
|
||||||
|
$req = json_decode('{"version":"U2F_V2","challenge":"yKA0x075tjJ-GE7fKTfnzTOSaNUOWQxRd9TWz5aFOg8","appId":"http://demo.example.com"}');
|
||||||
|
$resp = 'response';
|
||||||
|
$this->u2f->doRegister($req, $resp);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException u2flib_server\Error
|
||||||
|
* @expectedExceptionCode u2flib_server\ERR_BAD_UA_RETURNING
|
||||||
|
*/
|
||||||
|
public function testDoRegisterUAError() {
|
||||||
|
$req = json_decode('{"version":"U2F_V2","challenge":"yKA0x075tjJ-GE7fKTfnzTOSaNUOWQxRd9TWz5aFOg8","appId":"http://demo.example.com"}');
|
||||||
|
$resp = json_decode('{"errorCode": "4"}');
|
||||||
|
$this->u2f->doRegister($req, $resp);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \InvalidArgumentException
|
||||||
|
* @expectedExceptionMessage $include_cert of doRegister() method only accepts boolean.
|
||||||
|
*/
|
||||||
|
public function testDoRegisterInvalidInclude_cert() {
|
||||||
|
$req = json_decode('{"version":"U2F_V2","challenge":"yKA0x075tjJ-GE7fKTfnzTOSaNUOWQxRd9TWz5aFOg8","appId":"http://demo.example.com"}');
|
||||||
|
$resp = json_decode('{ "registrationData": "BQQtEmhWVgvbh-8GpjsHbj_d5FB9iNoRL8mNEq34-ANufKWUpVdIj6BSB_m3eMoZ3GqnaDy3RA5eWP8mhTkT1Ht3QAk1GsmaPIQgXgvrBkCQoQtMFvmwYPfW5jpRgoMPFxquHS7MTt8lofZkWAK2caHD-YQQdaRBgd22yWIjPuWnHOcwggLiMIHLAgEBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBDQTAeFw0xNDA1MTUxMjU4NTRaFw0xNDA2MTQxMjU4NTRaMB0xGzAZBgNVBAMTEll1YmljbyBVMkYgVGVzdCBFRTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNsK2_Uhx1zOY9ym4eglBg2U5idUGU-dJK8mGr6tmUQflaNxkQo6IOc-kV4T6L44BXrVeqN-dpCPr-KKlLYw650wDQYJKoZIhvcNAQELBQADggIBAJVAa1Bhfa2Eo7TriA_jMA8togoA2SUE7nL6Z99YUQ8LRwKcPkEpSpOsKYWJLaR6gTIoV3EB76hCiBaWN5HV3-CPyTyNsM2JcILsedPGeHMpMuWrbL1Wn9VFkc7B3Y1k3OmcH1480q9RpYIYr-A35zKedgV3AnvmJKAxVhv9GcVx0_CewHMFTryFuFOe78W8nFajutknarupekDXR4tVcmvj_ihJcST0j_Qggeo4_3wKT98CgjmBgjvKCd3Kqg8n9aSDVWyaOZsVOhZj3Fv5rFu895--D4qiPDETozJIyliH-HugoQpqYJaTX10mnmMdCa6aQeW9CEf-5QmbIP0S4uZAf7pKYTNmDQ5z27DVopqaFw00MIVqQkae_zSPX4dsNeeoTTXrwUGqitLaGap5ol81LKD9JdP3nSUYLfq0vLsHNDyNgb306TfbOenRRVsgQS8tJyLcknSKktWD_Qn7E5vjOXprXPrmdp7g5OPvrbz9QkWa1JTRfo2n2AXV02LPFc-UfR9bWCBEIJBxvmbpmqt0MnBTHWnth2b0CU_KJTDCY3kAPLGbOT8A4KiI73pRW-e9SWTaQXskw3Ei_dHRILM_l9OXsqoYHJ4Dd3tbfvmjoNYggSw4j50l3unI9d1qR5xlBFpW5sLr8gKX4bnY4SR2nyNiOQNLyPc0B0nW502aMEUCIQDTGOX-i_QrffJDY8XvKbPwMuBVrOSO-ayvTnWs_WSuDQIgZ7fMAvD_Ezyy5jg6fQeuOkoJi8V2naCtzV-HTly8Nww=", "clientData": "eyAiY2hhbGxlbmdlIjogInlLQTB4MDc1dGpKLUdFN2ZLVGZuelRPU2FOVU9XUXhSZDlUV3o1YUZPZzgiLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5maW5pc2hFbnJvbGxtZW50IiB9" }');
|
||||||
|
$this->u2f->doRegister($req, $resp, 'bar');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetAuthenticateData() {
|
||||||
|
$regs = array(json_decode('{"keyHandle":"CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","publicKey":"BC0SaFZWC9uH7wamOwduP93kUH2I2hEvyY0Srfj4A258pZSlV0iPoFIH+bd4yhncaqdoPLdEDl5Y\/yaFORPUe3c=","certificate":"MIIC4jCBywIBATANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgQ0EwHhcNMTQwNTE1MTI1ODU0WhcNMTQwNjE0MTI1ODU0WjAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgRUUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATbCtv1IcdczmPcpuHoJQYNlOYnVBlPnSSvJhq+rZlEH5WjcZEKOiDnPpFeE+i+OAV61XqjfnaQj6\/iipS2MOudMA0GCSqGSIb3DQEBCwUAA4ICAQCVQGtQYX2thKO064gP4zAPLaIKANklBO5y+mffWFEPC0cCnD5BKUqTrCmFiS2keoEyKFdxAe+oQogWljeR1d\/gj8k8jbDNiXCC7HnTxnhzKTLlq2y9Vp\/VRZHOwd2NZNzpnB9ePNKvUaWCGK\/gN+cynnYFdwJ75iSgMVYb\/RnFcdPwnsBzBU68hbhTnu\/FvJxWo7rZJ2q7qXpA10eLVXJr4\/4oSXEk9I\/0IIHqOP98Ck\/fAoI5gYI7ygndyqoPJ\/Wkg1VsmjmbFToWY9xb+axbvPefvg+KojwxE6MySMpYh\/h7oKEKamCWk19dJp5jHQmumkHlvQhH\/uUJmyD9EuLmQH+6SmEzZg0Oc9uw1aKamhcNNDCFakJGnv80j1+HbDXnqE0168FBqorS2hmqeaJfNSyg\/SXT950lGC36tLy7BzQ8jYG99Ok32znp0UVbIEEvLSci3JJ0ipLVg\/0J+xOb4zl6a1z65nae4OTj7628\/UJFmtSU0X6Np9gF1dNizxXPlH0fW1ggRCCQcb5m6ZqrdDJwUx1p7Ydm9AlPyiUwwmN5ADyxmzk\/AOCoiO96UVvnvUlk2kF7JMNxIv3R0SCzP5fTl7KqGByeA3d7W375o6DWIIEsOI+dJd7pyPXdakecZQRaVubC6\/ICl+G52OEkdp8jYjkDS8j3NAdJ1udNmg=="}'));
|
||||||
|
$data = $this->u2f->getAuthenticateData($regs);
|
||||||
|
$inst = $data[0];
|
||||||
|
$this->assertEquals("U2F_V2", $inst->version);
|
||||||
|
$this->assertObjectHasAttribute("challenge", $inst);
|
||||||
|
$this->assertEquals('CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w', $inst->keyHandle);
|
||||||
|
$this->assertEquals('http://demo.example.com', $inst->appId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \InvalidArgumentException
|
||||||
|
* @expectedExceptionMessage $registrations of getAuthenticateData() method only accepts array of object.
|
||||||
|
*/
|
||||||
|
public function testGetAuthenticateDataInvalidRegistrations2() {
|
||||||
|
$regs = array('YubiKey NEO', 'YubiKey Standard');
|
||||||
|
$data = $this->u2f->getAuthenticateData($regs);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testDoAuthenticate() {
|
||||||
|
$reqs = array(json_decode('{"version":"U2F_V2","challenge":"fEnc9oV79EaBgK5BoNERU5gPKM2XGYWrz4fUjgc0Q7g","keyHandle":"CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","appId":"http://demo.example.com"}'));
|
||||||
|
$regs = array(json_decode('{"keyHandle":"CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","publicKey":"BC0SaFZWC9uH7wamOwduP93kUH2I2hEvyY0Srfj4A258pZSlV0iPoFIH+bd4yhncaqdoPLdEDl5Y\/yaFORPUe3c=","certificate":"MIIC4jCBywIBATANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgQ0EwHhcNMTQwNTE1MTI1ODU0WhcNMTQwNjE0MTI1ODU0WjAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgRUUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATbCtv1IcdczmPcpuHoJQYNlOYnVBlPnSSvJhq+rZlEH5WjcZEKOiDnPpFeE+i+OAV61XqjfnaQj6\/iipS2MOudMA0GCSqGSIb3DQEBCwUAA4ICAQCVQGtQYX2thKO064gP4zAPLaIKANklBO5y+mffWFEPC0cCnD5BKUqTrCmFiS2keoEyKFdxAe+oQogWljeR1d\/gj8k8jbDNiXCC7HnTxnhzKTLlq2y9Vp\/VRZHOwd2NZNzpnB9ePNKvUaWCGK\/gN+cynnYFdwJ75iSgMVYb\/RnFcdPwnsBzBU68hbhTnu\/FvJxWo7rZJ2q7qXpA10eLVXJr4\/4oSXEk9I\/0IIHqOP98Ck\/fAoI5gYI7ygndyqoPJ\/Wkg1VsmjmbFToWY9xb+axbvPefvg+KojwxE6MySMpYh\/h7oKEKamCWk19dJp5jHQmumkHlvQhH\/uUJmyD9EuLmQH+6SmEzZg0Oc9uw1aKamhcNNDCFakJGnv80j1+HbDXnqE0168FBqorS2hmqeaJfNSyg\/SXT950lGC36tLy7BzQ8jYG99Ok32znp0UVbIEEvLSci3JJ0ipLVg\/0J+xOb4zl6a1z65nae4OTj7628\/UJFmtSU0X6Np9gF1dNizxXPlH0fW1ggRCCQcb5m6ZqrdDJwUx1p7Ydm9AlPyiUwwmN5ADyxmzk\/AOCoiO96UVvnvUlk2kF7JMNxIv3R0SCzP5fTl7KqGByeA3d7W375o6DWIIEsOI+dJd7pyPXdakecZQRaVubC6\/ICl+G52OEkdp8jYjkDS8j3NAdJ1udNmg==", "counter":3}'));
|
||||||
|
$resp = json_decode('{ "signatureData": "AQAAAAQwRQIhAI6FSrMD3KUUtkpiP0jpIEakql-HNhwWFngyw553pS1CAiAKLjACPOhxzZXuZsVO8im-HStEcYGC50PKhsGp_SUAng==", "clientData": "eyAiY2hhbGxlbmdlIjogImZFbmM5b1Y3OUVhQmdLNUJvTkVSVTVnUEtNMlhHWVdyejRmVWpnYzBRN2ciLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5nZXRBc3NlcnRpb24iIH0=", "keyHandle": "CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w", "errorCode": 0 }');
|
||||||
|
$data = $this->u2f->doAuthenticate($reqs, $regs, $resp);
|
||||||
|
$this->assertEquals(4, $data->counter);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException u2flib_server\Error
|
||||||
|
* @expectedExceptionCode u2flib_server\ERR_COUNTER_TOO_LOW
|
||||||
|
*/
|
||||||
|
public function testDoAuthenticateCtrFail() {
|
||||||
|
$reqs = array(json_decode('{"version":"U2F_V2","challenge":"fEnc9oV79EaBgK5BoNERU5gPKM2XGYWrz4fUjgc0Q7g","keyHandle":"CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","appId":"http://demo.example.com"}'));
|
||||||
|
$regs = array(json_decode('{"keyHandle":"CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","publicKey":"BC0SaFZWC9uH7wamOwduP93kUH2I2hEvyY0Srfj4A258pZSlV0iPoFIH+bd4yhncaqdoPLdEDl5Y\/yaFORPUe3c=","certificate":"MIIC4jCBywIBATANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgQ0EwHhcNMTQwNTE1MTI1ODU0WhcNMTQwNjE0MTI1ODU0WjAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgRUUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATbCtv1IcdczmPcpuHoJQYNlOYnVBlPnSSvJhq+rZlEH5WjcZEKOiDnPpFeE+i+OAV61XqjfnaQj6\/iipS2MOudMA0GCSqGSIb3DQEBCwUAA4ICAQCVQGtQYX2thKO064gP4zAPLaIKANklBO5y+mffWFEPC0cCnD5BKUqTrCmFiS2keoEyKFdxAe+oQogWljeR1d\/gj8k8jbDNiXCC7HnTxnhzKTLlq2y9Vp\/VRZHOwd2NZNzpnB9ePNKvUaWCGK\/gN+cynnYFdwJ75iSgMVYb\/RnFcdPwnsBzBU68hbhTnu\/FvJxWo7rZJ2q7qXpA10eLVXJr4\/4oSXEk9I\/0IIHqOP98Ck\/fAoI5gYI7ygndyqoPJ\/Wkg1VsmjmbFToWY9xb+axbvPefvg+KojwxE6MySMpYh\/h7oKEKamCWk19dJp5jHQmumkHlvQhH\/uUJmyD9EuLmQH+6SmEzZg0Oc9uw1aKamhcNNDCFakJGnv80j1+HbDXnqE0168FBqorS2hmqeaJfNSyg\/SXT950lGC36tLy7BzQ8jYG99Ok32znp0UVbIEEvLSci3JJ0ipLVg\/0J+xOb4zl6a1z65nae4OTj7628\/UJFmtSU0X6Np9gF1dNizxXPlH0fW1ggRCCQcb5m6ZqrdDJwUx1p7Ydm9AlPyiUwwmN5ADyxmzk\/AOCoiO96UVvnvUlk2kF7JMNxIv3R0SCzP5fTl7KqGByeA3d7W375o6DWIIEsOI+dJd7pyPXdakecZQRaVubC6\/ICl+G52OEkdp8jYjkDS8j3NAdJ1udNmg==", "counter":5}'));
|
||||||
|
$resp = json_decode('{ "signatureData": "AQAAAAQwRQIhAI6FSrMD3KUUtkpiP0jpIEakql-HNhwWFngyw553pS1CAiAKLjACPOhxzZXuZsVO8im-HStEcYGC50PKhsGp_SUAng==", "clientData": "eyAiY2hhbGxlbmdlIjogImZFbmM5b1Y3OUVhQmdLNUJvTkVSVTVnUEtNMlhHWVdyejRmVWpnYzBRN2ciLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5nZXRBc3NlcnRpb24iIH0=", "keyHandle": "CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w" }');
|
||||||
|
$this->u2f->doAuthenticate($reqs, $regs, $resp);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException u2flib_server\Error
|
||||||
|
* @expectedExceptionCode u2flib_server\ERR_AUTHENTICATION_FAILURE
|
||||||
|
*/
|
||||||
|
public function testDoAuthenticateFail() {
|
||||||
|
$reqs = array(json_decode('{"version":"U2F_V2","challenge":"fEnc9oV79EaBgK5BoNERU5gPKM2XGYWrz4fUjgc0Q7g","keyHandle":"CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","appId":"http://demo.example.com"}'));
|
||||||
|
$regs = array(json_decode('{"keyHandle":"CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","publicKey":"BC0SaFZWC9uH7wamOwduP93kUH2I2hEvyY0Srfj4A258pZSlV0iPoFIH+bd4yhncaqdoPLdEDl5Y\/yaFORPUe3c=","certificate":"MIIC4jCBywIBATANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgQ0EwHhcNMTQwNTE1MTI1ODU0WhcNMTQwNjE0MTI1ODU0WjAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgRUUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATbCtv1IcdczmPcpuHoJQYNlOYnVBlPnSSvJhq+rZlEH5WjcZEKOiDnPpFeE+i+OAV61XqjfnaQj6\/iipS2MOudMA0GCSqGSIb3DQEBCwUAA4ICAQCVQGtQYX2thKO064gP4zAPLaIKANklBO5y+mffWFEPC0cCnD5BKUqTrCmFiS2keoEyKFdxAe+oQogWljeR1d\/gj8k8jbDNiXCC7HnTxnhzKTLlq2y9Vp\/VRZHOwd2NZNzpnB9ePNKvUaWCGK\/gN+cynnYFdwJ75iSgMVYb\/RnFcdPwnsBzBU68hbhTnu\/FvJxWo7rZJ2q7qXpA10eLVXJr4\/4oSXEk9I\/0IIHqOP98Ck\/fAoI5gYI7ygndyqoPJ\/Wkg1VsmjmbFToWY9xb+axbvPefvg+KojwxE6MySMpYh\/h7oKEKamCWk19dJp5jHQmumkHlvQhH\/uUJmyD9EuLmQH+6SmEzZg0Oc9uw1aKamhcNNDCFakJGnv80j1+HbDXnqE0168FBqorS2hmqeaJfNSyg\/SXT950lGC36tLy7BzQ8jYG99Ok32znp0UVbIEEvLSci3JJ0ipLVg\/0J+xOb4zl6a1z65nae4OTj7628\/UJFmtSU0X6Np9gF1dNizxXPlH0fW1ggRCCQcb5m6ZqrdDJwUx1p7Ydm9AlPyiUwwmN5ADyxmzk\/AOCoiO96UVvnvUlk2kF7JMNxIv3R0SCzP5fTl7KqGByeA3d7W375o6DWIIEsOI+dJd7pyPXdakecZQRaVubC6\/ICl+G52OEkdp8jYjkDS8j3NAdJ1udNmg=="}'));
|
||||||
|
$resp = json_decode('{ "signatureData": "AQAAAAQwRQIhAI6FSrMD3KUUtkpiP0jpIEakql-HNhwWFngyw553pS1CAiAKLjACPOhxzZXuZsVO8im-HStEcYGC50PKhsGp_SUAnG==", "clientData": "eyAiY2hhbGxlbmdlIjogImZFbmM5b1Y3OUVhQmdLNUJvTkVSVTVnUEtNMlhHWVdyejRmVWpnYzBRN2ciLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5nZXRBc3NlcnRpb24iIH0=", "keyHandle": "CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w" }');
|
||||||
|
$this->u2f->doAuthenticate($reqs, $regs, $resp);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException u2flib_server\Error
|
||||||
|
* @expectedExceptionCode u2flib_server\ERR_NO_MATCHING_REQUEST
|
||||||
|
*/
|
||||||
|
public function testDoAuthenticateWrongReq() {
|
||||||
|
$reqs = array(json_decode('{"version":"U2F_V2","challenge":"fEnc9oV79EaBgK5BoNERU5gPKM2XGYWrz4fUjgc0Q7g","keyHandle":"cTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","appId":"http://demo.example.com"}'));
|
||||||
|
$regs = array(json_decode('{"keyHandle":"CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","publicKey":"BC0SaFZWC9uH7wamOwduP93kUH2I2hEvyY0Srfj4A258pZSlV0iPoFIH+bd4yhncaqdoPLdEDl5Y\/yaFORPUe3c=","certificate":"MIIC4jCBywIBATANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgQ0EwHhcNMTQwNTE1MTI1ODU0WhcNMTQwNjE0MTI1ODU0WjAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgRUUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATbCtv1IcdczmPcpuHoJQYNlOYnVBlPnSSvJhq+rZlEH5WjcZEKOiDnPpFeE+i+OAV61XqjfnaQj6\/iipS2MOudMA0GCSqGSIb3DQEBCwUAA4ICAQCVQGtQYX2thKO064gP4zAPLaIKANklBO5y+mffWFEPC0cCnD5BKUqTrCmFiS2keoEyKFdxAe+oQogWljeR1d\/gj8k8jbDNiXCC7HnTxnhzKTLlq2y9Vp\/VRZHOwd2NZNzpnB9ePNKvUaWCGK\/gN+cynnYFdwJ75iSgMVYb\/RnFcdPwnsBzBU68hbhTnu\/FvJxWo7rZJ2q7qXpA10eLVXJr4\/4oSXEk9I\/0IIHqOP98Ck\/fAoI5gYI7ygndyqoPJ\/Wkg1VsmjmbFToWY9xb+axbvPefvg+KojwxE6MySMpYh\/h7oKEKamCWk19dJp5jHQmumkHlvQhH\/uUJmyD9EuLmQH+6SmEzZg0Oc9uw1aKamhcNNDCFakJGnv80j1+HbDXnqE0168FBqorS2hmqeaJfNSyg\/SXT950lGC36tLy7BzQ8jYG99Ok32znp0UVbIEEvLSci3JJ0ipLVg\/0J+xOb4zl6a1z65nae4OTj7628\/UJFmtSU0X6Np9gF1dNizxXPlH0fW1ggRCCQcb5m6ZqrdDJwUx1p7Ydm9AlPyiUwwmN5ADyxmzk\/AOCoiO96UVvnvUlk2kF7JMNxIv3R0SCzP5fTl7KqGByeA3d7W375o6DWIIEsOI+dJd7pyPXdakecZQRaVubC6\/ICl+G52OEkdp8jYjkDS8j3NAdJ1udNmg=="}'));
|
||||||
|
$resp = json_decode('{ "signatureData": "AQAAAAQwRQIhAI6FSrMD3KUUtkpiP0jpIEakql-HNhwWFngyw553pS1CAiAKLjACPOhxzZXuZsVO8im-HStEcYGC50PKhsGp_SUAng==", "clientData": "eyAiY2hhbGxlbmdlIjogImZFbmM5b1Y3OUVhQmdLNUJvTkVSVTVnUEtNMlhHWVdyejRmVWpnYzBRN2ciLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5nZXRBc3NlcnRpb24iIH0=", "keyHandle": "CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w" }');
|
||||||
|
$this->u2f->doAuthenticate($reqs, $regs, $resp);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException u2flib_server\Error
|
||||||
|
* @expectedExceptionCode u2flib_server\ERR_NO_MATCHING_REGISTRATION
|
||||||
|
*/
|
||||||
|
public function testDoAuthenticateWrongReg() {
|
||||||
|
$reqs = array(json_decode('{"version":"U2F_V2","challenge":"fEnc9oV79EaBgK5BoNERU5gPKM2XGYWrz4fUjgc0Q7g","keyHandle":"CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","appId":"http://demo.example.com"}'));
|
||||||
|
$regs = array(json_decode('{"keyHandle":"cTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","publicKey":"BC0SaFZWC9uH7wamOwduP93kUH2I2hEvyY0Srfj4A258pZSlV0iPoFIH+bd4yhncaqdoPLdEDl5Y\/yaFORPUe3c=","certificate":"MIIC4jCBywIBATANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgQ0EwHhcNMTQwNTE1MTI1ODU0WhcNMTQwNjE0MTI1ODU0WjAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgRUUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATbCtv1IcdczmPcpuHoJQYNlOYnVBlPnSSvJhq+rZlEH5WjcZEKOiDnPpFeE+i+OAV61XqjfnaQj6\/iipS2MOudMA0GCSqGSIb3DQEBCwUAA4ICAQCVQGtQYX2thKO064gP4zAPLaIKANklBO5y+mffWFEPC0cCnD5BKUqTrCmFiS2keoEyKFdxAe+oQogWljeR1d\/gj8k8jbDNiXCC7HnTxnhzKTLlq2y9Vp\/VRZHOwd2NZNzpnB9ePNKvUaWCGK\/gN+cynnYFdwJ75iSgMVYb\/RnFcdPwnsBzBU68hbhTnu\/FvJxWo7rZJ2q7qXpA10eLVXJr4\/4oSXEk9I\/0IIHqOP98Ck\/fAoI5gYI7ygndyqoPJ\/Wkg1VsmjmbFToWY9xb+axbvPefvg+KojwxE6MySMpYh\/h7oKEKamCWk19dJp5jHQmumkHlvQhH\/uUJmyD9EuLmQH+6SmEzZg0Oc9uw1aKamhcNNDCFakJGnv80j1+HbDXnqE0168FBqorS2hmqeaJfNSyg\/SXT950lGC36tLy7BzQ8jYG99Ok32znp0UVbIEEvLSci3JJ0ipLVg\/0J+xOb4zl6a1z65nae4OTj7628\/UJFmtSU0X6Np9gF1dNizxXPlH0fW1ggRCCQcb5m6ZqrdDJwUx1p7Ydm9AlPyiUwwmN5ADyxmzk\/AOCoiO96UVvnvUlk2kF7JMNxIv3R0SCzP5fTl7KqGByeA3d7W375o6DWIIEsOI+dJd7pyPXdakecZQRaVubC6\/ICl+G52OEkdp8jYjkDS8j3NAdJ1udNmg=="}'));
|
||||||
|
$resp = json_decode('{ "signatureData": "AQAAAAQwRQIhAI6FSrMD3KUUtkpiP0jpIEakql-HNhwWFngyw553pS1CAiAKLjACPOhxzZXuZsVO8im-HStEcYGC50PKhsGp_SUAng==", "clientData": "eyAiY2hhbGxlbmdlIjogImZFbmM5b1Y3OUVhQmdLNUJvTkVSVTVnUEtNMlhHWVdyejRmVWpnYzBRN2ciLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5nZXRBc3NlcnRpb24iIH0=", "keyHandle": "CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w" }');
|
||||||
|
$this->u2f->doAuthenticate($reqs, $regs, $resp);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException u2flib_server\Error
|
||||||
|
* @expectedExceptionCode u2flib_server\ERR_PUBKEY_DECODE
|
||||||
|
*/
|
||||||
|
public function testDoAuthenticateBadKey() {
|
||||||
|
$reqs = array(json_decode('{"version":"U2F_V2","challenge":"fEnc9oV79EaBgK5BoNERU5gPKM2XGYWrz4fUjgc0Q7g","keyHandle":"CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","appId":"http://demo.example.com"}'));
|
||||||
|
$regs = array(json_decode('{"keyHandle":"CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","publicKey":"bC0SaFZWC9uH7wamOwduP93kUH2I2hEvyY0Srfj4A258pZSlV0iPoFIH+bd4yhncaqdoPLdEDl5Y\/yaFORPUe3c=","certificate":"MIIC4jCBywIBATANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgQ0EwHhcNMTQwNTE1MTI1ODU0WhcNMTQwNjE0MTI1ODU0WjAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgRUUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATbCtv1IcdczmPcpuHoJQYNlOYnVBlPnSSvJhq+rZlEH5WjcZEKOiDnPpFeE+i+OAV61XqjfnaQj6\/iipS2MOudMA0GCSqGSIb3DQEBCwUAA4ICAQCVQGtQYX2thKO064gP4zAPLaIKANklBO5y+mffWFEPC0cCnD5BKUqTrCmFiS2keoEyKFdxAe+oQogWljeR1d\/gj8k8jbDNiXCC7HnTxnhzKTLlq2y9Vp\/VRZHOwd2NZNzpnB9ePNKvUaWCGK\/gN+cynnYFdwJ75iSgMVYb\/RnFcdPwnsBzBU68hbhTnu\/FvJxWo7rZJ2q7qXpA10eLVXJr4\/4oSXEk9I\/0IIHqOP98Ck\/fAoI5gYI7ygndyqoPJ\/Wkg1VsmjmbFToWY9xb+axbvPefvg+KojwxE6MySMpYh\/h7oKEKamCWk19dJp5jHQmumkHlvQhH\/uUJmyD9EuLmQH+6SmEzZg0Oc9uw1aKamhcNNDCFakJGnv80j1+HbDXnqE0168FBqorS2hmqeaJfNSyg\/SXT950lGC36tLy7BzQ8jYG99Ok32znp0UVbIEEvLSci3JJ0ipLVg\/0J+xOb4zl6a1z65nae4OTj7628\/UJFmtSU0X6Np9gF1dNizxXPlH0fW1ggRCCQcb5m6ZqrdDJwUx1p7Ydm9AlPyiUwwmN5ADyxmzk\/AOCoiO96UVvnvUlk2kF7JMNxIv3R0SCzP5fTl7KqGByeA3d7W375o6DWIIEsOI+dJd7pyPXdakecZQRaVubC6\/ICl+G52OEkdp8jYjkDS8j3NAdJ1udNmg==", "counter":3}'));
|
||||||
|
$resp = json_decode('{ "signatureData": "AQAAAAQwRQIhAI6FSrMD3KUUtkpiP0jpIEakql-HNhwWFngyw553pS1CAiAKLjACPOhxzZXuZsVO8im-HStEcYGC50PKhsGp_SUAng==", "clientData": "eyAiY2hhbGxlbmdlIjogImZFbmM5b1Y3OUVhQmdLNUJvTkVSVTVnUEtNMlhHWVdyejRmVWpnYzBRN2ciLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5nZXRBc3NlcnRpb24iIH0=", "keyHandle": "CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w" }');
|
||||||
|
$this->u2f->doAuthenticate($reqs, $regs, $resp);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \InvalidArgumentException
|
||||||
|
* @expectedExceptionMessage $requests of doAuthenticate() method only accepts array of object.
|
||||||
|
*/
|
||||||
|
public function testDoAuthenticateInvalidRequests2() {
|
||||||
|
$reqs = array('YubiKey NEO', 'YubiKey Standard');
|
||||||
|
$regs = array(json_decode('{"keyHandle":"CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","publicKey":"BC0SaFZWC9uH7wamOwduP93kUH2I2hEvyY0Srfj4A258pZSlV0iPoFIH+bd4yhncaqdoPLdEDl5Y\/yaFORPUe3c=","certificate":"MIIC4jCBywIBATANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgQ0EwHhcNMTQwNTE1MTI1ODU0WhcNMTQwNjE0MTI1ODU0WjAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgRUUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATbCtv1IcdczmPcpuHoJQYNlOYnVBlPnSSvJhq+rZlEH5WjcZEKOiDnPpFeE+i+OAV61XqjfnaQj6\/iipS2MOudMA0GCSqGSIb3DQEBCwUAA4ICAQCVQGtQYX2thKO064gP4zAPLaIKANklBO5y+mffWFEPC0cCnD5BKUqTrCmFiS2keoEyKFdxAe+oQogWljeR1d\/gj8k8jbDNiXCC7HnTxnhzKTLlq2y9Vp\/VRZHOwd2NZNzpnB9ePNKvUaWCGK\/gN+cynnYFdwJ75iSgMVYb\/RnFcdPwnsBzBU68hbhTnu\/FvJxWo7rZJ2q7qXpA10eLVXJr4\/4oSXEk9I\/0IIHqOP98Ck\/fAoI5gYI7ygndyqoPJ\/Wkg1VsmjmbFToWY9xb+axbvPefvg+KojwxE6MySMpYh\/h7oKEKamCWk19dJp5jHQmumkHlvQhH\/uUJmyD9EuLmQH+6SmEzZg0Oc9uw1aKamhcNNDCFakJGnv80j1+HbDXnqE0168FBqorS2hmqeaJfNSyg\/SXT950lGC36tLy7BzQ8jYG99Ok32znp0UVbIEEvLSci3JJ0ipLVg\/0J+xOb4zl6a1z65nae4OTj7628\/UJFmtSU0X6Np9gF1dNizxXPlH0fW1ggRCCQcb5m6ZqrdDJwUx1p7Ydm9AlPyiUwwmN5ADyxmzk\/AOCoiO96UVvnvUlk2kF7JMNxIv3R0SCzP5fTl7KqGByeA3d7W375o6DWIIEsOI+dJd7pyPXdakecZQRaVubC6\/ICl+G52OEkdp8jYjkDS8j3NAdJ1udNmg==", "counter":3}'));
|
||||||
|
$resp = json_decode('{ "signatureData": "AQAAAAQwRQIhAI6FSrMD3KUUtkpiP0jpIEakql-HNhwWFngyw553pS1CAiAKLjACPOhxzZXuZsVO8im-HStEcYGC50PKhsGp_SUAng==", "clientData": "eyAiY2hhbGxlbmdlIjogImZFbmM5b1Y3OUVhQmdLNUJvTkVSVTVnUEtNMlhHWVdyejRmVWpnYzBRN2ciLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5nZXRBc3NlcnRpb24iIH0=", "keyHandle": "CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w" }');
|
||||||
|
$this->u2f->doAuthenticate($reqs, $regs, $resp);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \InvalidArgumentException
|
||||||
|
* @expectedExceptionMessage $registrations of doAuthenticate() method only accepts array of object.
|
||||||
|
*/
|
||||||
|
public function testDoAuthenticateInvalidRegistrations2() {
|
||||||
|
$reqs = array(json_decode('{"version":"U2F_V2","challenge":"fEnc9oV79EaBgK5BoNERU5gPKM2XGYWrz4fUjgc0Q7g","keyHandle":"CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","appId":"http://demo.example.com"}'));
|
||||||
|
$regs = array('YubiKey NEO', 'YubiKey Standard');
|
||||||
|
$resp = json_decode('{ "signatureData": "AQAAAAQwRQIhAI6FSrMD3KUUtkpiP0jpIEakql-HNhwWFngyw553pS1CAiAKLjACPOhxzZXuZsVO8im-HStEcYGC50PKhsGp_SUAng==", "clientData": "eyAiY2hhbGxlbmdlIjogImZFbmM5b1Y3OUVhQmdLNUJvTkVSVTVnUEtNMlhHWVdyejRmVWpnYzBRN2ciLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5nZXRBc3NlcnRpb24iIH0=", "keyHandle": "CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w" }');
|
||||||
|
$this->u2f->doAuthenticate($reqs, $regs, $resp);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException \InvalidArgumentException
|
||||||
|
* @expectedExceptionMessage $response of doAuthenticate() method only accepts object.
|
||||||
|
*/
|
||||||
|
public function testDoAuthenticateInvalidResponse() {
|
||||||
|
$reqs = array(json_decode('{"version":"U2F_V2","challenge":"fEnc9oV79EaBgK5BoNERU5gPKM2XGYWrz4fUjgc0Q7g","keyHandle":"CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","appId":"http://demo.example.com"}'));
|
||||||
|
$regs = array(json_decode('{"keyHandle":"CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","publicKey":"BC0SaFZWC9uH7wamOwduP93kUH2I2hEvyY0Srfj4A258pZSlV0iPoFIH+bd4yhncaqdoPLdEDl5Y\/yaFORPUe3c=","certificate":"MIIC4jCBywIBATANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgQ0EwHhcNMTQwNTE1MTI1ODU0WhcNMTQwNjE0MTI1ODU0WjAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgRUUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATbCtv1IcdczmPcpuHoJQYNlOYnVBlPnSSvJhq+rZlEH5WjcZEKOiDnPpFeE+i+OAV61XqjfnaQj6\/iipS2MOudMA0GCSqGSIb3DQEBCwUAA4ICAQCVQGtQYX2thKO064gP4zAPLaIKANklBO5y+mffWFEPC0cCnD5BKUqTrCmFiS2keoEyKFdxAe+oQogWljeR1d\/gj8k8jbDNiXCC7HnTxnhzKTLlq2y9Vp\/VRZHOwd2NZNzpnB9ePNKvUaWCGK\/gN+cynnYFdwJ75iSgMVYb\/RnFcdPwnsBzBU68hbhTnu\/FvJxWo7rZJ2q7qXpA10eLVXJr4\/4oSXEk9I\/0IIHqOP98Ck\/fAoI5gYI7ygndyqoPJ\/Wkg1VsmjmbFToWY9xb+axbvPefvg+KojwxE6MySMpYh\/h7oKEKamCWk19dJp5jHQmumkHlvQhH\/uUJmyD9EuLmQH+6SmEzZg0Oc9uw1aKamhcNNDCFakJGnv80j1+HbDXnqE0168FBqorS2hmqeaJfNSyg\/SXT950lGC36tLy7BzQ8jYG99Ok32znp0UVbIEEvLSci3JJ0ipLVg\/0J+xOb4zl6a1z65nae4OTj7628\/UJFmtSU0X6Np9gF1dNizxXPlH0fW1ggRCCQcb5m6ZqrdDJwUx1p7Ydm9AlPyiUwwmN5ADyxmzk\/AOCoiO96UVvnvUlk2kF7JMNxIv3R0SCzP5fTl7KqGByeA3d7W375o6DWIIEsOI+dJd7pyPXdakecZQRaVubC6\/ICl+G52OEkdp8jYjkDS8j3NAdJ1udNmg==", "counter":3}'));
|
||||||
|
$resp = 'Response';
|
||||||
|
$this->u2f->doAuthenticate($reqs, $regs, $resp);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @expectedException u2flib_server\Error
|
||||||
|
* @expectedExceptionCode u2flib_server\ERR_BAD_UA_RETURNING
|
||||||
|
*/
|
||||||
|
public function testDoAuthenticateUAError() {
|
||||||
|
$reqs = array(json_decode('{"version":"U2F_V2","challenge":"fEnc9oV79EaBgK5BoNERU5gPKM2XGYWrz4fUjgc0Q7g","keyHandle":"CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","appId":"http://demo.example.com"}'));
|
||||||
|
$regs = array(json_decode('{"keyHandle":"CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w","publicKey":"BC0SaFZWC9uH7wamOwduP93kUH2I2hEvyY0Srfj4A258pZSlV0iPoFIH+bd4yhncaqdoPLdEDl5Y\/yaFORPUe3c=","certificate":"MIIC4jCBywIBATANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgQ0EwHhcNMTQwNTE1MTI1ODU0WhcNMTQwNjE0MTI1ODU0WjAdMRswGQYDVQQDExJZdWJpY28gVTJGIFRlc3QgRUUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATbCtv1IcdczmPcpuHoJQYNlOYnVBlPnSSvJhq+rZlEH5WjcZEKOiDnPpFeE+i+OAV61XqjfnaQj6\/iipS2MOudMA0GCSqGSIb3DQEBCwUAA4ICAQCVQGtQYX2thKO064gP4zAPLaIKANklBO5y+mffWFEPC0cCnD5BKUqTrCmFiS2keoEyKFdxAe+oQogWljeR1d\/gj8k8jbDNiXCC7HnTxnhzKTLlq2y9Vp\/VRZHOwd2NZNzpnB9ePNKvUaWCGK\/gN+cynnYFdwJ75iSgMVYb\/RnFcdPwnsBzBU68hbhTnu\/FvJxWo7rZJ2q7qXpA10eLVXJr4\/4oSXEk9I\/0IIHqOP98Ck\/fAoI5gYI7ygndyqoPJ\/Wkg1VsmjmbFToWY9xb+axbvPefvg+KojwxE6MySMpYh\/h7oKEKamCWk19dJp5jHQmumkHlvQhH\/uUJmyD9EuLmQH+6SmEzZg0Oc9uw1aKamhcNNDCFakJGnv80j1+HbDXnqE0168FBqorS2hmqeaJfNSyg\/SXT950lGC36tLy7BzQ8jYG99Ok32znp0UVbIEEvLSci3JJ0ipLVg\/0J+xOb4zl6a1z65nae4OTj7628\/UJFmtSU0X6Np9gF1dNizxXPlH0fW1ggRCCQcb5m6ZqrdDJwUx1p7Ydm9AlPyiUwwmN5ADyxmzk\/AOCoiO96UVvnvUlk2kF7JMNxIv3R0SCzP5fTl7KqGByeA3d7W375o6DWIIEsOI+dJd7pyPXdakecZQRaVubC6\/ICl+G52OEkdp8jYjkDS8j3NAdJ1udNmg==", "counter":3}'));
|
||||||
|
$resp = json_decode('{"errorCode": "5"}');
|
||||||
|
$this->u2f->doAuthenticate($reqs, $regs, $resp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
||||||
|
|
@ -24,9 +24,10 @@ if (file_exists('./inc/vars.local.inc.php')) {
|
||||||
// Yubi OTP API
|
// Yubi OTP API
|
||||||
require_once 'inc/lib/Yubico.php';
|
require_once 'inc/lib/Yubico.php';
|
||||||
|
|
||||||
// U2F API
|
// U2F API + T/HOTP API
|
||||||
require_once 'inc/lib/U2F.php';
|
require_once 'inc/lib/vendor/autoload.php';
|
||||||
$u2f = new u2flib_server\U2F('https://' . $_SERVER['SERVER_NAME']);
|
$u2f = new u2flib_server\U2F('https://' . $_SERVER['SERVER_NAME']);
|
||||||
|
$tfa = new RobThree\Auth\TwoFactorAuth('mailcow UI');
|
||||||
|
|
||||||
// PDO
|
// PDO
|
||||||
// Calculate offset
|
// Calculate offset
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,6 @@
|
||||||
|
<?php
|
||||||
|
if (isset($_SESSION['mailcow_cc_role']) && ($_SESSION['mailcow_cc_role'] == "admin" || $_SESSION['mailcow_cc_role'] == "domainadmin")):
|
||||||
|
?>
|
||||||
<div class="modal fade" id="YubiOTPModal" tabindex="-1" role="dialog" aria-labelledby="YubiOTPModalLabel">
|
<div class="modal fade" id="YubiOTPModal" tabindex="-1" role="dialog" aria-labelledby="YubiOTPModalLabel">
|
||||||
<div class="modal-dialog" role="document">
|
<div class="modal-dialog" role="document">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
|
|
@ -57,6 +60,44 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="modal fade" id="TOTPModal" tabindex="-1" role="dialog" aria-labelledby="TOTPModalLabel">
|
||||||
|
<div class="modal-dialog" role="document">
|
||||||
|
<div class="modal-content">
|
||||||
|
<div class="modal-header"><b><?=$lang['tfa']['totp'];?></b></div>
|
||||||
|
<div class="modal-body">
|
||||||
|
<form role="form" method="post">
|
||||||
|
<div class="form-group">
|
||||||
|
<input type="text" class="form-control" name="key_id" id="key_id" placeholder="<?=$lang['tfa']['key_id_totp'];?>" autocomplete="off" required>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<input type="password" class="form-control" name="confirm_password" id="confirm_password" placeholder="<?=$lang['user']['password_now'];?>" autocomplete="off" required>
|
||||||
|
</div>
|
||||||
|
<hr>
|
||||||
|
<?php
|
||||||
|
$totp_secret = $tfa->createSecret();
|
||||||
|
?>
|
||||||
|
<input type="hidden" value="<?=$totp_secret;?>" name="totp_secret" id="totp_secret"/>
|
||||||
|
<input type="hidden" name="tfa_method" value="totp">
|
||||||
|
<ol>
|
||||||
|
<li>
|
||||||
|
<p><?=$lang['tfa']['scan_qr_code'];?></p>
|
||||||
|
<img src="<?=$tfa->getQRCodeImageAsDataUri($_SESSION['mailcow_cc_username'], $totp_secret);?>">
|
||||||
|
<p class="help-block"><?=$lang['tfa']['enter_qr_code'];?>:<br />
|
||||||
|
<code><?=$totp_secret;?></code>
|
||||||
|
</p>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<p><?=$lang['tfa']['confirm_totp_token'];?>:</p>
|
||||||
|
<p><input type="number" style="width:33%" class="form-control" name="totp_confirm_token" id="totp_confirm_token" autocomplete="off" required></p>
|
||||||
|
<p><button class="btn btn-default" type="submit" name="set_tfa"><?=$lang['tfa']['confirm'];?></button></p>
|
||||||
|
</li>
|
||||||
|
</ol>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="modal fade" id="DisableTFAModal" tabindex="-1" role="dialog" aria-labelledby="DisableTFAModalLabel">
|
<div class="modal fade" id="DisableTFAModal" tabindex="-1" role="dialog" aria-labelledby="DisableTFAModalLabel">
|
||||||
<div class="modal-dialog" role="document">
|
<div class="modal-dialog" role="document">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
|
|
@ -77,6 +118,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
endif;
|
||||||
if (isset($_SESSION['pending_tfa_method'])):
|
if (isset($_SESSION['pending_tfa_method'])):
|
||||||
$tfa_method = $_SESSION['pending_tfa_method'];
|
$tfa_method = $_SESSION['pending_tfa_method'];
|
||||||
?>
|
?>
|
||||||
|
|
@ -114,8 +156,17 @@ if (isset($_SESSION['pending_tfa_method'])):
|
||||||
break;
|
break;
|
||||||
case "totp":
|
case "totp":
|
||||||
?>
|
?>
|
||||||
<div class="empty"></div>
|
<form role="form" method="post">
|
||||||
<?php
|
<div class="form-group">
|
||||||
|
<div class="input-group">
|
||||||
|
<span class="input-group-addon" id="tfa-addon"><span class="glyphicon glyphicon-lock" aria-hidden="true"></span></span>
|
||||||
|
<input type="number" min="000000" max="999999" name="token" id="token" class="form-control" placeholder="123456" aria-describedby="tfa-addon">
|
||||||
|
<input type="hidden" name="tfa_method" value="totp">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button class="btn btn-sm btn-default" type="submit" name="verify_tfa_login"><?=$lang['login']['login'];?></button>
|
||||||
|
</form>
|
||||||
|
<?php
|
||||||
break;
|
break;
|
||||||
case "hotp":
|
case "hotp":
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
|
|
@ -107,8 +107,8 @@ $(document).ready(function() {
|
||||||
});
|
});
|
||||||
$('#mailbox_table').footable({
|
$('#mailbox_table').footable({
|
||||||
"columns": [
|
"columns": [
|
||||||
{"sorted": true,"name":"username","style":{"word-break":"break-all","min-width":"180px"},"title":lang.username},
|
{"sorted": true,"name":"username","style":{"word-break":"break-all","min-width":"120px"},"title":lang.username},
|
||||||
{"name":"name","title":lang.fname,"style":{"word-break":"break-all","min-width":"180px"},"breakpoints":"xs sm"},
|
{"name":"name","title":lang.fname,"style":{"word-break":"break-all","min-width":"120px"},"breakpoints":"xs sm"},
|
||||||
{"name":"domain","title":lang.domain,"breakpoints":"xs sm"},
|
{"name":"domain","title":lang.domain,"breakpoints":"xs sm"},
|
||||||
{"name":"quota","style":{"whiteSpace":"nowrap"},"title":lang.domain_quota,"formatter": function(value){
|
{"name":"quota","style":{"whiteSpace":"nowrap"},"title":lang.domain_quota,"formatter": function(value){
|
||||||
res = value.split("/");
|
res = value.split("/");
|
||||||
|
|
@ -120,10 +120,10 @@ $(document).ready(function() {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{"name":"spam_aliases","filterable": false,"title":lang.spam_aliases,"breakpoints":"xs sm md"},
|
{"name":"spam_aliases","filterable": false,"title":lang.spam_aliases,"breakpoints":"xs sm md"},
|
||||||
{"name":"in_use","filterable": false,"style":{"whiteSpace":"nowrap"},"type":"html","title":lang.in_use},
|
{"name":"in_use","filterable": false,"type":"html","title":lang.in_use},
|
||||||
{"name":"messages","filterable": false,"style":{"whiteSpace":"nowrap"},"title":lang.msg_num,"breakpoints":"xs sm md"},
|
{"name":"messages","filterable": false,"title":lang.msg_num,"breakpoints":"xs sm md"},
|
||||||
{"name":"active","filterable": false,"style":{"whiteSpace":"nowrap"},"title":lang.active},
|
{"name":"active","filterable": false,"title":lang.active},
|
||||||
{"name":"action","filterable": false,"sortable": false,"style":{"whiteSpace":"nowrap","text-align":"right","width":"290px"},"type":"html","title":lang.action,"breakpoints":"xs sm md"}
|
{"name":"action","filterable": false,"sortable": false,"style":{"text-align":"right","min-width":"250px"},"type":"html","title":lang.action,"breakpoints":"xs sm md"}
|
||||||
],
|
],
|
||||||
"empty": lang.empty,
|
"empty": lang.empty,
|
||||||
"rows": data,
|
"rows": data,
|
||||||
|
|
|
||||||
|
|
@ -395,6 +395,7 @@ $lang['tfa']['tfa'] = "Two-Factor Authentication";
|
||||||
$lang['tfa']['set_tfa'] = "Konfiguriere Two-Factor Authentication Methode";
|
$lang['tfa']['set_tfa'] = "Konfiguriere Two-Factor Authentication Methode";
|
||||||
$lang['tfa']['yubi_otp'] = "Yubico OTP Authentifizierung";
|
$lang['tfa']['yubi_otp'] = "Yubico OTP Authentifizierung";
|
||||||
$lang['tfa']['key_id'] = "Ein Name für diesen YubiKey";
|
$lang['tfa']['key_id'] = "Ein Name für diesen YubiKey";
|
||||||
|
$lang['tfa']['key_id_totp'] = "Ein eindeutiger Name";
|
||||||
$lang['tfa']['api_register'] = 'mailcow verwendet die Yubico Cloud API. Ein API-Key für den Yubico Stick kann <a href="https://upgrade.yubico.com/getapikey/" target="_blank">hier</a> bezogen werden.';
|
$lang['tfa']['api_register'] = 'mailcow verwendet die Yubico Cloud API. Ein API-Key für den Yubico Stick kann <a href="https://upgrade.yubico.com/getapikey/" target="_blank">hier</a> bezogen werden.';
|
||||||
$lang['tfa']['u2f'] = "U2F Authentifizierung";
|
$lang['tfa']['u2f'] = "U2F Authentifizierung";
|
||||||
$lang['tfa']['hotp'] = "HOTP Authentifizierung";
|
$lang['tfa']['hotp'] = "HOTP Authentifizierung";
|
||||||
|
|
@ -405,10 +406,14 @@ $lang['tfa']['disable_tfa'] = "Deaktiviere TFA bis zur nächsten erfolgreichen A
|
||||||
$lang['tfa']['confirm_tfa'] = "Please confirm your one-time password in the below field";
|
$lang['tfa']['confirm_tfa'] = "Please confirm your one-time password in the below field";
|
||||||
$lang['tfa']['confirm'] = "Bestätigen";
|
$lang['tfa']['confirm'] = "Bestätigen";
|
||||||
$lang['tfa']['otp'] = "Einmalpasswort";
|
$lang['tfa']['otp'] = "Einmalpasswort";
|
||||||
|
$lang['tfa']['totp'] = "Time-based OTP (Google Authenticator etc.)";
|
||||||
$lang['tfa']['trash_login'] = "Login verwerfen";
|
$lang['tfa']['trash_login'] = "Login verwerfen";
|
||||||
$lang['tfa']['select'] = "Bitte auswählen";
|
$lang['tfa']['select'] = "Bitte auswählen";
|
||||||
$lang['tfa']['waiting_usb_auth'] = "<i>Warte auf USB-Gerät...</i><br /><br />Bitte jetzt den vorgesehenen Taster des U2F USB-Gerätes berühren.";
|
$lang['tfa']['waiting_usb_auth'] = "<i>Warte auf USB-Gerät...</i><br /><br />Bitte jetzt den vorgesehenen Taster des U2F USB-Gerätes berühren.";
|
||||||
$lang['tfa']['waiting_usb_register'] = "<i>Warte auf USB-Gerät...</i><br /><br />Bitte zuerst das obere Passwortfeld ausfüllen und erst dann den vorgesehenen Taster des U2F USB-Gerätes berühren.";
|
$lang['tfa']['waiting_usb_register'] = "<i>Warte auf USB-Gerät...</i><br /><br />Bitte zuerst das obere Passwortfeld ausfüllen und erst dann den vorgesehenen Taster des U2F USB-Gerätes berühren.";
|
||||||
|
$lang['tfa']['scan_qr_code'] = "Bitte scannen Sie jetzt den angezeigten QR-Code:.";
|
||||||
|
$lang['tfa']['enter_qr_code'] = "Falls Sie den angezeigten QR-Code nicht scannen können, verwenden Sie bitte nachstehenden Sicherheitsschlüssel";
|
||||||
|
$lang['tfa']['confirm_totp_token'] = "Bitte bestätigen Sie die Änderung durch Eingabe eines generierten Tokens";
|
||||||
|
|
||||||
$lang['admin']['search_domain_da'] = 'Domains durchsuchen';
|
$lang['admin']['search_domain_da'] = 'Domains durchsuchen';
|
||||||
$lang['admin']['restrictions'] = 'Postifx Restriktionen';
|
$lang['admin']['restrictions'] = 'Postifx Restriktionen';
|
||||||
|
|
|
||||||
|
|
@ -400,6 +400,7 @@ $lang['tfa']['tfa'] = "Two-factor authentication";
|
||||||
$lang['tfa']['set_tfa'] = "Set two-factor authentication method";
|
$lang['tfa']['set_tfa'] = "Set two-factor authentication method";
|
||||||
$lang['tfa']['yubi_otp'] = "Yubico OTP authentication";
|
$lang['tfa']['yubi_otp'] = "Yubico OTP authentication";
|
||||||
$lang['tfa']['key_id'] = "An identifier for your YubiKey";
|
$lang['tfa']['key_id'] = "An identifier for your YubiKey";
|
||||||
|
$lang['tfa']['key_id_totp'] = "An identifier for your key";
|
||||||
$lang['tfa']['api_register'] = 'mailcow uses the Yubico Cloud API. Please get an API key for your key <a href="https://upgrade.yubico.com/getapikey/" target="_blank">here</a>';
|
$lang['tfa']['api_register'] = 'mailcow uses the Yubico Cloud API. Please get an API key for your key <a href="https://upgrade.yubico.com/getapikey/" target="_blank">here</a>';
|
||||||
$lang['tfa']['u2f'] = "U2F authentication";
|
$lang['tfa']['u2f'] = "U2F authentication";
|
||||||
$lang['tfa']['hotp'] = "HOTP authentication";
|
$lang['tfa']['hotp'] = "HOTP authentication";
|
||||||
|
|
@ -410,10 +411,14 @@ $lang['tfa']['disable_tfa'] = "Disable TFA until next successful login";
|
||||||
$lang['tfa']['confirm_tfa'] = "Please confirm your one-time password in the below field";
|
$lang['tfa']['confirm_tfa'] = "Please confirm your one-time password in the below field";
|
||||||
$lang['tfa']['confirm'] = "Confirm";
|
$lang['tfa']['confirm'] = "Confirm";
|
||||||
$lang['tfa']['otp'] = "One-time password";
|
$lang['tfa']['otp'] = "One-time password";
|
||||||
|
$lang['tfa']['totp'] = "Time-based OTP (Google Authenticator etc.)";
|
||||||
$lang['tfa']['trash_login'] = "Trash login";
|
$lang['tfa']['trash_login'] = "Trash login";
|
||||||
$lang['tfa']['select'] = "Please select";
|
$lang['tfa']['select'] = "Please select";
|
||||||
$lang['tfa']['waiting_usb_auth'] = "<i>Waiting for USB device...</i><br /><br />Please tap the button on your U2F USB device now.";
|
$lang['tfa']['waiting_usb_auth'] = "<i>Waiting for USB device...</i><br /><br />Please tap the button on your U2F USB device now.";
|
||||||
$lang['tfa']['waiting_usb_register'] = "<i>Waiting for USB device...</i><br /><br />Please enter your password above and confirm your U2F registration by tapping the button on your U2F USB device.";
|
$lang['tfa']['waiting_usb_register'] = "<i>Waiting for USB device...</i><br /><br />Please enter your password above and confirm your U2F registration by tapping the button on your U2F USB device.";
|
||||||
|
$lang['tfa']['scan_qr_code'] = "Please scan the following code with your authenticator app or enter the code manually.";
|
||||||
|
$lang['tfa']['enter_qr_code'] = "Your TOTP code if your device cannot scan QR codes";
|
||||||
|
$lang['tfa']['confirm_totp_token'] = "Please confirm your changes by entering the generated token";
|
||||||
|
|
||||||
$lang['admin']['search_domain_da'] = 'Search domains';
|
$lang['admin']['search_domain_da'] = 'Search domains';
|
||||||
$lang['admin']['restrictions'] = 'Postifx Restrictions';
|
$lang['admin']['restrictions'] = 'Postifx Restrictions';
|
||||||
|
|
|
||||||
|
|
@ -45,6 +45,7 @@ if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == 'doma
|
||||||
<select id="selectTFA" class="selectpicker" title="<?=$lang['tfa']['select'];?>">
|
<select id="selectTFA" class="selectpicker" title="<?=$lang['tfa']['select'];?>">
|
||||||
<option value="yubi_otp"><?=$lang['tfa']['yubi_otp'];?></option>
|
<option value="yubi_otp"><?=$lang['tfa']['yubi_otp'];?></option>
|
||||||
<option value="u2f"><?=$lang['tfa']['u2f'];?></option>
|
<option value="u2f"><?=$lang['tfa']['u2f'];?></option>
|
||||||
|
<option value="totp"><?=$lang['tfa']['totp'];?></option>
|
||||||
<option value="none"><?=$lang['tfa']['none'];?></option>
|
<option value="none"><?=$lang['tfa']['none'];?></option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -398,7 +399,7 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="col-sm-12">
|
<div class="col-sm-12">
|
||||||
<button type="submit" id="edit_tls_policy" name="edit_tls_policy" class="btn btn-default"><?=$lang['user']['save_changes'];?></button>
|
<button type="submit" id="edit_tls_policy" name="edit_tls_policy" class="btn btn-success"><?=$lang['user']['save_changes'];?></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
@ -431,7 +432,7 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '
|
||||||
<td><?=htmlspecialchars($row['user1']);?></td>
|
<td><?=htmlspecialchars($row['user1']);?></td>
|
||||||
<td><?=($row['exclude'] == '') ? '✘' : '<code>' . $row['exclude'] . '</code>';?></td>
|
<td><?=($row['exclude'] == '') ? '✘' : '<code>' . $row['exclude'] . '</code>';?></td>
|
||||||
<td><?=htmlspecialchars($row['mins_interval']);?> min</td>
|
<td><?=htmlspecialchars($row['mins_interval']);?> min</td>
|
||||||
<td><?=(empty($row['last_run'])) ? '✘' : htmlspecialchars(date($lang['user']['syncjob_full_date'], strtotime($row['last_run'] . ' UTC')));?></td>
|
<td><?=(empty($row['last_run'])) ? '✘' : htmlspecialchars(date($lang['user']['syncjob_full_date'], strtotime($row['last_run'])));?></td>
|
||||||
<td>
|
<td>
|
||||||
<?php
|
<?php
|
||||||
if (empty($row['returned_text'])) {
|
if (empty($row['returned_text'])) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue