Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev #205

Merged
merged 6 commits into from
Jul 27, 2023
Merged

Dev #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f856329
Update Setup.php
LDAV May 12, 2023
f9e0d00
feat: add function getIdPList
damikael Jul 3, 2023
14a27f2
v.3.17.0
damikael Jul 3, 2023
148aa49
fix: metadata spid namespaces
damikael Jul 27, 2023
a76a1dc
SPID compliant certificate
damikael Jul 27, 2023
76ccaf6
Merge branch 'master' into dev
damikael Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"config": {
"version": "3.16.0",
"version": "3.17.0",
"allow-plugins": {
"simplesamlphp/composer-module-installer": true
}
Expand Down
34 changes: 28 additions & 6 deletions setup/Setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ public static function setup(Event $event) {
$config['installDir'] . "/vendor/simplesamlphp/simplesamlphp/cert"
);
echo $colors->getColoredString("\nConfiguring OpenSSL... ", "white");
if (!file_exists('openssl.cnf')) {
if (!file_exists('spid-php-openssl.cnf')) {
$openssl_config = fopen("spid-php-openssl.cnf", "w");
fwrite($openssl_config, "oid_section = spid_oids\n");

Expand All @@ -848,8 +848,12 @@ public static function setup(Event $event) {

fwrite($openssl_config, "\n[ spid_oids ]\n");
//fwrite($openssl_config, "organizationIdentifier=2.5.4.97\n");
fwrite($openssl_config, "spid-privatesector-SP=1.3.76.16.4.3.1\n");
fwrite($openssl_config, "spid-publicsector-SP=1.3.76.16.4.2.1\n");
fwrite($openssl_config, "agidcert=1.3.76.16.6\n");
if($config['spIsPublicAdministration']) {
fwrite($openssl_config, "spid-publicsector-SP=1.3.76.16.4.2.1\n");
} else {
fwrite($openssl_config, "spid-privatesector-SP=1.3.76.16.4.3.1\n");
}
fwrite($openssl_config, "uri=2.5.4.83\n");

fwrite($openssl_config, "\n[ dn ]\n");
Expand All @@ -862,7 +866,16 @@ public static function setup(Event $event) {
//fwrite($openssl_config, "serialNumber=" . $config['spOrganizationCode'] . "\n");

fwrite($openssl_config, "\n[ req_ext ]\n");
fwrite($openssl_config, "certificatePolicies = @spid_policies\n");
fwrite($openssl_config, "basicConstraints=CA:FALSE\n");
fwrite($openssl_config, "keyUsage=critical,digitalSignature,nonRepudiation\n");
fwrite($openssl_config, "certificatePolicies=@agid_policies,@spid_policies\n");

fwrite($openssl_config, "\n[ agid_policies ]\n");
fwrite($openssl_config, "policyIdentifier=agidcert\n");
fwrite($openssl_config, "userNotice=@agidcert_notice\n");

fwrite($openssl_config, "\n[ agidcert_notice ]\n");
fwrite($openssl_config, "explicitText=\"agIDcert\"\n");

fwrite($openssl_config, "\n[ spid_policies ]\n");
switch ($config['spIsPublicAdministration']) {
Expand All @@ -878,7 +891,16 @@ public static function setup(Event $event) {
die();
break;
}
echo $colors->getColoredString("OK\n", "green");
fwrite($openssl_config, "userNotice=@spid_notice\n");

fwrite($openssl_config, "\n[ spid_notice ]\n");
if($config['spIsPublicAdministration']) {
fwrite($openssl_config, "explicitText=\"cert_SP_Pub\"\n");
} else {
fwrite($openssl_config, "explicitText=\"cert_SP_Priv\"\n");
}

echo $colors->getColoredString("OK\n", "green");
}
shell_exec(
"openssl req -new -x509 -config spid-php-openssl.cnf -days 730 " .
Expand Down Expand Up @@ -908,7 +930,7 @@ public static function setup(Event $event) {
$config['installDir'] . "/vendor/simplesamlphp/simplesamlphp/cert"
);
echo $colors->getColoredString("\nConfiguring OpenSSL... ", "white");
if (!file_exists('openssl.cnf')) {
if (!file_exists('cie-php-openssl.cnf')) {
$openssl_config = fopen("cie-php-openssl.cnf", "w");
fwrite($openssl_config, "oid_section = cie_oids\n");

Expand Down
25 changes: 13 additions & 12 deletions setup/sdk/spid-php.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,29 @@
{{IDPS}}
}

public function isSPIDEnabled() {
return self::SPID_ENABLED;
}

public function isCIEEnabled() {
return self::CIE_ENABLED;
}

public function getIdPList() {
require_once("vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php");
$list = array();
foreach($this->idps as $code=>$entity_id) {

$list = [];
foreach($this->idps as $code => $entity_id) {
array_push($list, array(
'name' => $metadata[$entity_id]['name']['it'],
'entity_id' => $entity_id,
'code' => $code,
'image' => $metadata[$entity_id]['icon']
'logo_uri' => $metadata[$entity_id]['icon']
));
}

return $list;
}

public function isSPIDEnabled() {
return self::SPID_ENABLED;
}

public function isCIEEnabled() {
return self::CIE_ENABLED;
}

public function getIdP() {
return $this->spid_auth->getAuthData('saml:sp:IdP');
}
Expand Down
12 changes: 4 additions & 8 deletions setup/simplesamlphp/saml2/src/SAML2/XML/md/ContactPerson.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public function __construct(DOMElement $xml = null)
if ($xml->hasAttribute('entityType')) {
// SPID Entity Type (Avviso SPID n.19 v.4)
if(substr($xml->getAttribute('entityType'), 0, 5)=='spid:') {
$this->setEntityType($xml->getAttribute('entityType'), 'spid');
$this->setEntityType($xml->getAttribute('entityType'), 'spid:https://spid.gov.it/saml-extensions');
} else {
$this->setEntityType($xml->getAttribute('entityType'));
}
Expand Down Expand Up @@ -219,13 +219,8 @@ public function setContactType(string $contactType) : void
*/
public function setEntityType(string $entityType, string $ns=null) : void
{
if($ns!=null && $ns!='') {
$this->entityType = $ns.':'.$entityType;
$this->entityTypeNS = $ns;
} else {
$this->entityType = $entityType;
$this->entityTypeNS = null;
}
$this->entityTypeNS = $ns;
}


Expand Down Expand Up @@ -457,7 +452,8 @@ public function toXML(DOMElement $parent) : DOMElement
$e->setAttribute('contactType', $this->getContactType());

if ($this->entityType != null) {
$e->setAttribute($this->entityTypeNS . ($this->entityTypeNS? ':' : '') . 'entityType', $this->getEntityType());
$attribute = ($this->entityTypeNS=='spid:https://spid.gov.it/saml-extensions')? 'spid:entityType' : 'entityType';
$e->setAttribute($attribute, $this->entityType);
}

foreach ($this->getContactPersonAttributes() as $attr => $val) {
Expand Down
Loading