Révision ff5e5aec
Ajouté par Thomas Noël il y a plus de 9 ans
| conf.default/config.xml | ||
|---|---|---|
| 481 | 481 |
<federations> |
| 482 | 482 |
<federation> |
| 483 | 483 |
<enable/> |
| 484 |
<codename>renater-test</codename>
|
|
| 484 |
<codename>renater_test</codename>
|
|
| 485 | 485 |
<refid>fed_53d1161955a26</refid> |
| 486 | 486 |
<descr><![CDATA[Renater TEST Federation]]></descr> |
| 487 | 487 |
<url>https://federation.renater.fr/test/renater-test-metadata.xml</url> |
| 488 | 488 |
<certref>53d115fac567b</certref> |
| 489 |
<caref>53d1166cc8bae</caref> |
|
| 490 | 489 |
</federation> |
| 491 | 490 |
<federation> |
| 492 | 491 |
<codename>renater</codename> |
| ... | ... | |
| 494 | 493 |
<descr><![CDATA[Renater Federation]]></descr> |
| 495 | 494 |
<url>https://federation.renater.fr/renater/renater-metadata.xml</url> |
| 496 | 495 |
<certref>53d115fac567b</certref> |
| 497 |
<caref>53d1166cc8bae</caref> |
|
| 498 | 496 |
</federation> |
| 499 | 497 |
<federation> |
| 500 | 498 |
<codename>edugain</codename> |
| ... | ... | |
| 502 | 500 |
<descr><![CDATA[GEANT eduGAIN]]></descr> |
| 503 | 501 |
<url>http://mds.edugain.org/feed-sha256.xml</url> |
| 504 | 502 |
<certref>53d11784a0379</certref> |
| 505 |
<caref>__none__</caref> |
|
| 506 | 503 |
</federation> |
| 507 | 504 |
</federations> |
| 508 | 505 |
<sp> |
| usr/local/www/services_captiveportal_saml_federation.php | ||
|---|---|---|
| 102 | 102 |
$pconfig['descr'] = $a_federation[$id]['descr']; |
| 103 | 103 |
$pconfig['url'] = $a_federation[$id]['url']; |
| 104 | 104 |
$pconfig['certref'] = $a_federation[$id]['certref']; |
| 105 |
$pconfig['caref'] = $a_federation[$id]['caref']; |
|
| 106 | 105 |
} |
| 107 | 106 |
|
| 108 | 107 |
if ($act == "new") {
|
| ... | ... | |
| 116 | 115 |
$pconfig = $_POST; |
| 117 | 116 |
|
| 118 | 117 |
/* input validation */ |
| 119 |
$reqdfields = explode(" ", "codename descr url certref caref");
|
|
| 118 |
$reqdfields = explode(" ", "codename descr url certref");
|
|
| 120 | 119 |
$reqdfieldsn = array( |
| 121 | 120 |
gettext("Codename"),
|
| 122 | 121 |
gettext("Description"),
|
| ... | ... | |
| 152 | 151 |
$federation['descr'] = $pconfig['descr']; |
| 153 | 152 |
$federation['url'] = $pconfig['url']; |
| 154 | 153 |
$federation['certref'] = $pconfig['certref']; |
| 155 |
$federation['caref'] = $pconfig['caref']; |
|
| 156 | 154 |
|
| 157 | 155 |
if ($_POST['enable']) |
| 158 | 156 |
$federation['enable'] = true; |
| ... | ... | |
| 279 | 277 |
</td> |
| 280 | 278 |
</tr> |
| 281 | 279 |
|
| 282 |
<tr> |
|
| 283 |
<td width="22%" valign="top" class="vncellreq"><?=gettext("HTTPS CA certificate"); ?></td>
|
|
| 284 |
<td width="78%" class="vtable"> |
|
| 285 |
<?php if (count($a_ca)): ?> |
|
| 286 |
<select name="caref" id="caref" class="formselect"> |
|
| 287 |
<option value="__none__">None</option> |
|
| 288 |
<?php |
|
| 289 |
foreach($a_ca as $ca): |
|
| 290 |
$selected = ""; |
|
| 291 |
if ($pconfig['caref'] == $ca['refid']) |
|
| 292 |
$selected = "selected"; |
|
| 293 |
?> |
|
| 294 |
<option value="<?=$ca['refid'];?>" <?=$selected;?>><?=$ca['descr'];?></option> |
|
| 295 |
<?php endforeach; ?> |
|
| 296 |
</select> |
|
| 297 |
<br/><?=gettext("If None, the HTTPS server certificate will not be checked."); ?>
|
|
| 298 |
<?php else: ?> |
|
| 299 |
<b><?=gettext("No CA defined."); ?></b> <br/>Create one under <a href="system_certmanager.php">System > Cert Manager</a>.
|
|
| 300 |
<?php endif; ?> |
|
| 301 |
</td> |
|
| 302 |
</tr> |
|
| 303 |
|
|
| 304 |
|
|
| 305 | 280 |
</table> |
| 306 | 281 |
|
| 307 | 282 |
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="save"> |
Formats disponibles : Unified diff
caref is useless in federation metadata