3 files updated
This commit is contained in:
		
							parent
							
								
									4243be829d
								
							
						
					
					
						commit
						2705180320
					
				
							
								
								
									
										20
									
								
								bundles.yml
								
								
								
								
							
							
						
						
									
										20
									
								
								bundles.yml
								
								
								
								
							|  | @ -1,12 +1,12 @@ | ||||||
| schemaVersion: "1.0" | schemaVersion: "1.0" | ||||||
| bundles: | bundles: | ||||||
| - "nevisadmin-plugin-base-generation:7.2402.1.3" | - "nevisadmin-plugin-oauth:8.2405.2.0" | ||||||
| - "nevisadmin-plugin-oauth:7.2402.1.3" | - "nevisadmin-plugin-authcloud:8.2405.2.0" | ||||||
| - "nevisadmin-plugin-nevisdetect:7.2402.1.3" | - "nevisadmin-plugin-nevisidm:8.2405.2.0" | ||||||
| - "nevisadmin-plugin-nevisauth:7.2402.1.3" | - "nevisadmin-plugin-mobile-auth:8.2405.2.0" | ||||||
| - "nevisadmin-plugin-nevisdp:7.2402.1.3" | - "nevisadmin-plugin-fido2:8.2405.2.0" | ||||||
| - "nevisadmin-plugin-nevisproxy:7.2402.1.3" | - "nevisadmin-plugin-nevisdp:8.2405.2.0" | ||||||
| - "nevisadmin-plugin-mobile-auth:7.2402.1.3" | - "nevisadmin-plugin-nevisauth:8.2405.2.0" | ||||||
| - "nevisadmin-plugin-nevisidm:7.2402.1.3" | - "nevisadmin-plugin-nevisproxy:8.2405.2.0" | ||||||
| - "nevisadmin-plugin-fido2:7.2402.1.3" | - "nevisadmin-plugin-nevisdetect:8.2405.2.0" | ||||||
| - "nevisadmin-plugin-authcloud:7.2402.1.3" | - "nevisadmin-plugin-base-generation:8.2405.2.0" | ||||||
|  |  | ||||||
|  | @ -26,7 +26,7 @@ String level100RoleExtid = parameters.get('level100.roleExtid') | ||||||
| 
 | 
 | ||||||
| String baseUrl = "${parameters.get('idm.baseUrl')}/core/v1/$clientExtId" | String baseUrl = "${parameters.get('idm.baseUrl')}/core/v1/$clientExtId" | ||||||
| boolean audited = false | boolean audited = false | ||||||
| String agovAq100AuthEndpoint = null | String aq100AuthRestURL = null | ||||||
| String endpoint = null | String endpoint = null | ||||||
| 
 | 
 | ||||||
| // 1) create the profile if needed | // 1) create the profile if needed | ||||||
|  | @ -79,14 +79,14 @@ if (!Arrays.stream(response.getActualRoles()).filter( r -> r.contains('AGOV-Loi. | ||||||
| 		LOG.warn("Event='DATAERROR', Requester='${requester}', RequestId='${requestId}', RequestedAq=${requestedAq}, User=${user}, CredentialType='${credentialType}', SourceIp=${sourceIp}, UserAgent='${userAgent}', reason='created missing AGOVaq 100 role'") | 		LOG.warn("Event='DATAERROR', Requester='${requester}', RequestId='${requestId}', RequestedAq=${requestedAq}, User=${user}, CredentialType='${credentialType}', SourceIp=${sourceIp}, UserAgent='${userAgent}', reason='created missing AGOVaq 100 role'") | ||||||
| 		audited = true | 		audited = true | ||||||
| 	} | 	} | ||||||
| 	agovAq100AuthEndpoint = result.getLocation() | 	aq100AuthRestURL = result.getLocation() | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| // 3) set the AQ level 100 verification to None | // 3) set the AQ level 100 verification to None | ||||||
| if (!session['ch.adnovum.nevisidm.userDto'].contains("<properties><name>idVerification</name><value>None</value><scopeName>AGOV-Loi,level100</scopeName></properties>")) { | if (!session['ch.adnovum.nevisidm.userDto'].contains("<properties><name>idVerification</name><value>None</value><scopeName>AGOV-Loi,level100</scopeName></properties>")) { | ||||||
| 
 | 
 | ||||||
| 	if (agovAq100AuthEndpoint == null) { | 	if (aq100AuthRestURL == null) { | ||||||
| 		endpoint = "${baseUrl}/profiles/${profileExtId}/authorizations" | 		endpoint = "${baseUrl}/profiles/${profileExtId}/authorizations" | ||||||
| 
 | 
 | ||||||
| 		def result = idmRestClient.get(endpoint) | 		def result = idmRestClient.get(endpoint) | ||||||
|  | @ -99,7 +99,7 @@ if (!session['ch.adnovum.nevisidm.userDto'].contains("<properties><name>idVerifi | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	endpoint = "${agovAq100AuthEndpoint}/properties" | 	endpoint = "${aq100AuthRestURL}/properties" | ||||||
| 
 | 
 | ||||||
| 	def patchRequest = new HTTPRequestWrapper() | 	def patchRequest = new HTTPRequestWrapper() | ||||||
| 	patchRequest.addToHeaders('Content-Type',  ['application/json']) | 	patchRequest.addToHeaders('Content-Type',  ['application/json']) | ||||||
|  |  | ||||||
|  | @ -1,4 +1,5 @@ | ||||||
| import groovy.json.JsonSlurper | import groovy.json.JsonSlurper | ||||||
|  | import io.opentelemetry.api.trace.Span | ||||||
| 
 | 
 | ||||||
| def url = parameters.get('url') | def url = parameters.get('url') | ||||||
| 
 | 
 | ||||||
|  | @ -6,6 +7,12 @@ try { | ||||||
|   //TODO/haburger/2024-AUG-20: remove if reCaptcha is not needed anymore |   //TODO/haburger/2024-AUG-20: remove if reCaptcha is not needed anymore | ||||||
|   session.remove('agov.fido2.X-ReCAPTCHA-Integration') |   session.remove('agov.fido2.X-ReCAPTCHA-Integration') | ||||||
| 
 | 
 | ||||||
|  |   def spanCtxt = Span.current().getSpanContext() | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  |   def traceparent = "00-${spanCtxt.getTraceId()}-${spanCtxt.getSpanId()}-${spanCtxt.getTraceFlags().asHex()}" | ||||||
|  |   LOG.error('traceparent: ' + traceparent) | ||||||
|  | 
 | ||||||
|   def jsonSlurper = new JsonSlurper() |   def jsonSlurper = new JsonSlurper() | ||||||
|   def httpClient = HttpClients.create(parameters) |   def httpClient = HttpClients.create(parameters) | ||||||
|   def httpResponse = Http.get().url(url).build().send(httpClient) |   def httpResponse = Http.get().url(url).build().send(httpClient) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue