Browse Source

2023-01-09 / ct_chen

Actions:
1. Webservice fix bug of certificate file upload

Files:
1. EVSE/rootfs/var/www/set_backend_action.php
   EVSE/rootfs/var/www/set_charging_action.php
ct_chen 2 years ago
parent
commit
9d125d809b

+ 5 - 5
EVSE/rootfs/var/www/set_backend_action.php

@@ -125,7 +125,7 @@
 				echo json_encode($jsone);
 				exit;
 			}
-			else if(strpos(exec('openssl rsa -noout -modulus -in '.$_FILES['private_key']['name']),"Modulus")===false){	//unable to load Private Key
+			else if(strpos(exec('openssl rsa -noout -modulus -in '.$_FILES['private_key']['tmp_name']),"Modulus")===false){	//unable to load Private Key
 				$jsone['result'] = "Error";
 				$jsone['message'] = "format of Private Key is incorrect";
 				echo json_encode($jsone);
@@ -143,7 +143,7 @@
 				echo json_encode($jsone);
 				exit;
 			}
-			else if(strpos(exec('openssl x509 -noout -modulus -in '.$_FILES['certificate']['name']),"Modulus")===false){	//unable to load certificate
+			else if(strpos(exec('openssl x509 -noout -modulus -in '.$_FILES['certificate']['tmp_name']),"Modulus")===false){	//unable to load certificate
 				$jsone['result'] = "Error";
 				$jsone['message'] = "format of Certificate is incorrect";
 				echo json_encode($jsone);
@@ -161,7 +161,7 @@
 				echo json_encode($jsone);
 				exit;
 			}
-			else if(strpos(exec('openssl x509 -noout -modulus -in '.$_FILES['MORootCertificate']['name']),"Modulus")===false){	//unable to load MORootCertificate
+			else if(strpos(exec('openssl x509 -noout -modulus -in '.$_FILES['MORootCertificate']['tmp_name']),"Modulus")===false){	//unable to load MORootCertificate
 				$jsone['result'] = "Error";
 				$jsone['message'] = "format of MO Root Certificate is incorrect";
 				echo json_encode($jsone);
@@ -179,7 +179,7 @@
 				echo json_encode($jsone);
 				exit;
 			}
-			else if(strpos(exec('openssl x509 -noout -modulus -in '.$_FILES['CSRootCertificate']['name']),"Modulus")===false){	//unable to load CSRootCertificate
+			else if(strpos(exec('openssl x509 -noout -modulus -in '.$_FILES['CSRootCertificate']['tmp_name']),"Modulus")===false){	//unable to load CSRootCertificate
 				$jsone['result'] = "Error";
 				$jsone['message'] = "format of CS Root Certificate is incorrect";
 				echo json_encode($jsone);
@@ -197,7 +197,7 @@
 				echo json_encode($jsone);
 				exit;
 			}
-			else if(strpos(exec('openssl x509 -noout -modulus -in '.$_FILES['ManufacturerRootCertificate']['name']),"Modulus")===false){	//unable to load ManufacturerRootCertificate
+			else if(strpos(exec('openssl x509 -noout -modulus -in '.$_FILES['ManufacturerRootCertificate']['tmp_name']),"Modulus")===false){	//unable to load ManufacturerRootCertificate
 				$jsone['result'] = "Error";
 				$jsone['message'] = "format of Manufacturer Root Certificate is incorrect";
 				echo json_encode($jsone);

+ 3 - 5
EVSE/rootfs/var/www/set_charging_action.php

@@ -175,8 +175,6 @@
 		if(isset($_POST['Fee23'])){
 			$json['Fee23']						= isset($_POST['Fee23'])?round($_POST['Fee23'], 2):"";
 		}
-		exec('openssl rsa -noout -modulus -in /var/www/private.key');
-		exec('openssl x509 -noout -modulus -in /var/www/cacert.pem');
 		$fCount = empty($_FILES['V2GPrivateKey']['tmp_name'][0]);
 		if($fCount!=1){
 			if ($_FILES["V2GPrivateKey"]["error"] > 0)
@@ -186,7 +184,7 @@
 				echo json_encode($jsone);
 				exit;
 			}
-			else if(strpos(exec('openssl rsa -noout -modulus -in '.$_FILES['V2GPrivateKey']['name']),"Modulus")===false){	//unable to load V2GPrivateKey
+			else if(strpos(exec('openssl rsa -noout -modulus -in '.$_FILES['V2GPrivateKey']['tmp_name']),"Modulus")===false){	//unable to load V2GPrivateKey
 				$jsone['result'] = "Error";
 				$jsone['message'] = "format of V2G Private Key is incorrect";
 				echo json_encode($jsone);
@@ -204,7 +202,7 @@
 				echo json_encode($jsone);
 				exit;
 			}
-			else if(strpos(exec('openssl x509 -noout -modulus -in '.$_FILES['V2GRootCertificate']['name']),"Modulus")===false){	//unable to load V2GRootCertificate
+			else if(strpos(exec('openssl x509 -noout -modulus -in '.$_FILES['V2GRootCertificate']['tmp_name']),"Modulus")===false){	//unable to load V2GRootCertificate
 				$jsone['result'] = "Error";
 				$jsone['message'] = "format of V2G Root Certificate is incorrect";
 				echo json_encode($jsone);
@@ -222,7 +220,7 @@
 				echo json_encode($jsone);
 				exit;
 			}
-			else if(strpos(exec('openssl x509 -noout -modulus -in '.$_FILES['V2GCertificateChain']['name']),"Modulus")===false){	//unable to load V2GCertificateChain
+			else if(strpos(exec('openssl x509 -noout -modulus -in '.$_FILES['V2GCertificateChain']['tmp_name']),"Modulus")===false){	//unable to load V2GCertificateChain
 				$jsone['result'] = "Error";
 				$jsone['message'] = "format of V2G Certificate Chain is incorrect";
 				echo json_encode($jsone);