> samlAttributes;
+ private final AuthnContextClassRefs authnContextClassRefs;
@Autowired
@SuppressWarnings("unchecked")
public UserController(ObjectMapper objectMapper,
+ AuthnContextClassRefs authnContextClassRefs,
@Value("${idp.saml_attributes_config_file}") String samlAttributesConfigFile) throws IOException {
DefaultResourceLoader loader = new DefaultResourceLoader();
@@ -33,6 +36,7 @@ public UserController(ObjectMapper objectMapper,
loader.getResource(samlAttributesConfigFile).getInputStream(), new TypeReference<>() {
});
this.samlAttributes.sort(comparing(m -> m.get("id")));
+ this.authnContextClassRefs = authnContextClassRefs;
}
@GetMapping("/")
@@ -49,6 +53,7 @@ public String user(Authentication authentication, ModelMap modelMap) {
@GetMapping("/login")
public String login(ModelMap modelMap) {
modelMap.addAttribute("samlAttributes", samlAttributes);
+ modelMap.addAttribute("authnContextClassRefs", authnContextClassRefs.getValues());
return "login";
}
}
diff --git a/mujina-idp/src/main/resources/application.yml b/mujina-idp/src/main/resources/application.yml
index a4c647d4..cfb33d04 100644
--- a/mujina-idp/src/main/resources/application.yml
+++ b/mujina-idp/src/main/resources/application.yml
@@ -51,6 +51,17 @@ idp:
[urn:mace:dir:attribute-def:eduPersonPrincipalName]: "j.doe@example.com"
[urn:oasis:names:tc:SAML:attribute:subject-id]: "j.doe@example.com"
+acr:
+ values:
+ - "http://test2.surfconext.nl/assurance/loa1"
+ - "http://test2.surfconext.nl/assurance/loa1.5"
+ - "http://test2.surfconext.nl/assurance/loa2"
+ - "http://test2.surfconext.nl/assurance/loa3"
+ - "https://eduid.nl/trust/linked-institution"
+ - "https://eduid.nl/trust/validate-names"
+ - "https://eduid.nl/trust/affiliation-student"
+ - "https://refeds.org/profile/mfa"
+
spring:
mvc:
favicon:
diff --git a/mujina-idp/src/main/resources/public/main.css b/mujina-idp/src/main/resources/public/main.css
index d769b5da..341ed3bf 100644
--- a/mujina-idp/src/main/resources/public/main.css
+++ b/mujina-idp/src/main/resources/public/main.css
@@ -130,6 +130,16 @@ label.persist-me {
font-size: 14px;
}
+div.authn-context-class-ref {
+ display: flex;
+ flex-direction: column;
+ margin: 15px 0 5px 0;
+}
+
+label.authn-context-class-ref {
+ font-size: 16px;
+}
+
div.add-attribute {
display: flex;
margin-bottom: 10px;
@@ -147,6 +157,17 @@ select.attribute-select {
height: 40px;
}
+select.acr-select {
+ flex-grow: 2;
+ border-radius: 3px;
+ margin: 2px 0 8px 0;
+ font-size: 16px;
+ background-color: white;
+ border: 1px solid #e4e4e4;
+ box-shadow: inset 0 1px 3px #e6e6e6;
+ height: 40px;
+}
+
li.attribute-value {
display: flex;
position: relative;
diff --git a/mujina-idp/src/main/resources/public/main.js b/mujina-idp/src/main/resources/public/main.js
index 30948f0b..d9143e63 100644
--- a/mujina-idp/src/main/resources/public/main.js
+++ b/mujina-idp/src/main/resources/public/main.js
@@ -1,73 +1,79 @@
function guid() {
- function s4() {
- return Math.floor((1 + Math.random()) * 0x10000)
- .toString(16)
- .substring(1);
- }
+ function s4() {
+ return Math.floor((1 + Math.random()) * 0x10000)
+ .toString(16)
+ .substring(1);
+ }
- return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4();
+ return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4();
}
document.addEventListener("DOMContentLoaded", function () {
- [].forEach.call(document.querySelectorAll(".help,.close"), function (el) {
- el.addEventListener("click", function (e) {
- e.stopPropagation();
- e.preventDefault();
- var explanation = document.getElementById("explanation");
- explanation.classList.toggle("hide");
- if (!explanation.classList.contains("hide")) {
- setTimeout(function () {
- document.getElementById("close").focus();
- }, 25);
- }
+ [].forEach.call(document.querySelectorAll(".help,.close"), function (el) {
+ el.addEventListener("click", function (e) {
+ e.stopPropagation();
+ e.preventDefault();
+ var explanation = document.getElementById("explanation");
+ explanation.classList.toggle("hide");
+ if (!explanation.classList.contains("hide")) {
+ setTimeout(function () {
+ document.getElementById("close").focus();
+ }, 25);
+ }
+ });
});
- });
- document.getElementById("close").addEventListener("blur", function () {
- document.getElementById("explanation").classList.add("hide");
- });
+ document.getElementById("close").addEventListener("blur", function () {
+ document.getElementById("explanation").classList.add("hide");
+ });
- document.querySelector(".attribute-select").addEventListener("change", function (e) {
- var val = e.target.value;
- var selectedOption = document.querySelector('option[value="' + val + '"]');
- var text = selectedOption.text;
- var multiplicity = selectedOption.dataset.multiplicity === "true";
- var newElement = document.createElement("li");
- newElement.setAttribute("class", "attribute-value");
- var mainId = guid();
- newElement.setAttribute("id", mainId);
- var spanId = guid();
- var inputId = guid();
- newElement.innerHTML = "" +
- "" +
- "🗑";
- document.getElementById("attribute-list").appendChild(newElement);
- document.getElementById(spanId).addEventListener("click", function () {
- var element = document.getElementById(mainId);
- element.parentNode.removeChild(element);
- if (!multiplicity) {
- var select = document.getElementById("add-attribute");
- var option = document.createElement("option");
- option.text = text;
- option.value = val;
- select.add(option);
- }
+ document.querySelector(".acr-select").addEventListener("change", function (e) {
+ var val = e.target.value;
+ var acrSelect = document.getElementById("authn-context-class-ref-value");
+ acrSelect.value = val;
});
- var select = document.getElementById("add-attribute");
- if (!multiplicity) {
- select.remove(select.selectedIndex);
- }
- select.value = "Add attribute...";
- setTimeout(function () {
- var inputElement = document.getElementById(inputId);
- inputElement.focus();
- inputElement.addEventListener("keypress", function (e) {
- if (e.code === "Enter") {
- e.stopPropagation();
- e.preventDefault();
- select.focus();
+
+ document.querySelector(".attribute-select").addEventListener("change", function (e) {
+ var val = e.target.value;
+ var selectedOption = document.querySelector('option[value="' + val + '"]');
+ var text = selectedOption.text;
+ var multiplicity = selectedOption.dataset.multiplicity === "true";
+ var newElement = document.createElement("li");
+ newElement.setAttribute("class", "attribute-value");
+ var mainId = guid();
+ newElement.setAttribute("id", mainId);
+ var spanId = guid();
+ var inputId = guid();
+ newElement.innerHTML = "" +
+ "" +
+ "🗑";
+ document.getElementById("attribute-list").appendChild(newElement);
+ document.getElementById(spanId).addEventListener("click", function () {
+ var element = document.getElementById(mainId);
+ element.parentNode.removeChild(element);
+ if (!multiplicity) {
+ var select = document.getElementById("add-attribute");
+ var option = document.createElement("option");
+ option.text = text;
+ option.value = val;
+ select.add(option);
+ }
+ });
+ var select = document.getElementById("add-attribute");
+ if (!multiplicity) {
+ select.remove(select.selectedIndex);
}
- });
- }, 25);
- });
+ select.value = "Add attribute...";
+ setTimeout(function () {
+ var inputElement = document.getElementById(inputId);
+ inputElement.focus();
+ inputElement.addEventListener("keypress", function (e) {
+ if (e.code === "Enter") {
+ e.stopPropagation();
+ e.preventDefault();
+ select.focus();
+ }
+ });
+ }, 25);
+ });
});
diff --git a/mujina-idp/src/main/resources/templates/login.html b/mujina-idp/src/main/resources/templates/login.html
index 1035b4e6..f36f6194 100644
--- a/mujina-idp/src/main/resources/templates/login.html
+++ b/mujina-idp/src/main/resources/templates/login.html
@@ -55,6 +55,21 @@ Mujina Identity Provider
+
+
+
+
+
+