Kaydet (Commit) 19de0ad3 authored tarafından mertcelen's avatar mertcelen

Fix when cert signer is null.

üst 677da7a6
...@@ -80,8 +80,8 @@ class MainController extends Controller ...@@ -80,8 +80,8 @@ class MainController extends Controller
$cert = stream_context_get_params($read); $cert = stream_context_get_params($read);
$certinfo = openssl_x509_parse($cert['options']['ssl']['peer_certificate']); $certinfo = openssl_x509_parse($cert['options']['ssl']['peer_certificate']);
openssl_x509_export($cert["options"]["ssl"]["peer_certificate"],$publicKey); openssl_x509_export($cert["options"]["ssl"]["peer_certificate"],$publicKey);
$certinfo["subjectKeyIdentifier"] = $certinfo["extensions"]["subjectKeyIdentifier"]; $certinfo["subjectKeyIdentifier"] = array_key_exists("subjectKeyIdentifier",$certinfo["extensions"]) ? $certinfo["extensions"]["subjectKeyIdentifier"]: "";
$certinfo["authorityKeyIdentifier"] = substr($certinfo["extensions"]["authorityKeyIdentifier"],6); $certinfo["authorityKeyIdentifier"] = array_key_exists("authorityKeyIdentifier",$certinfo["extensions"]) ? substr($certinfo["extensions"]["authorityKeyIdentifier"],6): "";
$certinfo["validFrom_time_t"] = Carbon::createFromTimestamp($certinfo["validFrom_time_t"])->format('H:i d/m/Y'); $certinfo["validFrom_time_t"] = Carbon::createFromTimestamp($certinfo["validFrom_time_t"])->format('H:i d/m/Y');
$certinfo["validTo_time_t"] = Carbon::createFromTimestamp($certinfo["validTo_time_t"])->format('H:i d/m/Y'); $certinfo["validTo_time_t"] = Carbon::createFromTimestamp($certinfo["validTo_time_t"])->format('H:i d/m/Y');
unset($certinfo["extensions"]); unset($certinfo["extensions"]);
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
"ext-ssh2": "*", "ext-ssh2": "*",
"ext-xml": "*", "ext-xml": "*",
"ext-zip": "*", "ext-zip": "*",
"icewind/smb": "^3.1",
"laravel/framework": "^6.0", "laravel/framework": "^6.0",
"laravel/helpers": "*", "laravel/helpers": "*",
"phpseclib/phpseclib": "^2.0" "phpseclib/phpseclib": "^2.0"
......
This diff is collapsed.
...@@ -104,8 +104,12 @@ ...@@ -104,8 +104,12 @@
form.append('port',$("#port").val()); form.append('port',$("#port").val());
request('{{route('certificate_request')}}',form,function (success) { request('{{route('certificate_request')}}',form,function (success) {
let json = JSON.parse(success)["message"]; let json = JSON.parse(success)["message"];
$("#issuerCN").val(json["issuer"]["CN"]); if(json["issuer"]["DC"]){
$("#issuerDN").val(json["issuer"]["DC"].reverse().join('.')); $("#issuerCN").val(json["issuer"]["CN"]);
}
if(json["issuer"]["DC"]){
$("#issuerDN").val(json["issuer"]["DC"].reverse().join('.'));
}
$("#validFrom").val(json["validFrom_time_t"]); $("#validFrom").val(json["validFrom_time_t"]);
$("#validTo").val(json["validTo_time_t"]); $("#validTo").val(json["validTo_time_t"]);
$("#authorityKeyIdentifier").val(json["authorityKeyIdentifier"]); $("#authorityKeyIdentifier").val(json["authorityKeyIdentifier"]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment