@@ -98,8 +98,11 @@ public class AlamofireWrapper: NSObject {
9898 // Apply server trust evaluation if security policy is set
9999 if let secPolicy = securityPolicy, let host = url. host {
100100 afRequest = afRequest. validate { _, response, _ in
101+ guard let serverTrust = response. serverTrust else {
102+ return . failure( AFError . serverTrustEvaluationFailed ( reason: . noServerTrust) )
103+ }
101104 do {
102- try secPolicy. evaluate ( response . serverTrust! , forHost: host)
105+ try secPolicy. evaluate ( serverTrust, forHost: host)
103106 return . success( Void ( ) )
104107 } catch {
105108 return . failure( error)
@@ -189,15 +192,20 @@ public class AlamofireWrapper: NSObject {
189192 // Apply server trust evaluation if security policy is set
190193 if let secPolicy = securityPolicy, let host = url. host {
191194 afRequest = afRequest. validate { _, response, _ in
195+ guard let serverTrust = response. serverTrust else {
196+ return . failure( AFError . serverTrustEvaluationFailed ( reason: . noServerTrust) )
197+ }
192198 do {
193- try secPolicy. evaluate ( response . serverTrust! , forHost: host)
199+ try secPolicy. evaluate ( serverTrust, forHost: host)
194200 return . success( Void ( ) )
195201 } catch {
196202 return . failure( error)
197203 }
198204 }
199205 }
200206
207+ // Upload progress
208+
201209 // Upload progress
202210 if let progress = progress {
203211 afRequest = afRequest. uploadProgress { progressInfo in
@@ -247,15 +255,20 @@ public class AlamofireWrapper: NSObject {
247255 // Apply server trust evaluation if security policy is set
248256 if let secPolicy = securityPolicy, let host = request. url? . host {
249257 afRequest = afRequest. validate { _, response, _ in
258+ guard let serverTrust = response. serverTrust else {
259+ return . failure( AFError . serverTrustEvaluationFailed ( reason: . noServerTrust) )
260+ }
250261 do {
251- try secPolicy. evaluate ( response . serverTrust! , forHost: host)
262+ try secPolicy. evaluate ( serverTrust, forHost: host)
252263 return . success( Void ( ) )
253264 } catch {
254265 return . failure( error)
255266 }
256267 }
257268 }
258269
270+ // Upload progress
271+
259272 // Upload progress
260273 if let progress = progress {
261274 afRequest = afRequest. uploadProgress { progressInfo in
@@ -295,15 +308,20 @@ public class AlamofireWrapper: NSObject {
295308 // Apply server trust evaluation if security policy is set
296309 if let secPolicy = securityPolicy, let host = request. url? . host {
297310 afRequest = afRequest. validate { _, response, _ in
311+ guard let serverTrust = response. serverTrust else {
312+ return . failure( AFError . serverTrustEvaluationFailed ( reason: . noServerTrust) )
313+ }
298314 do {
299- try secPolicy. evaluate ( response . serverTrust! , forHost: host)
315+ try secPolicy. evaluate ( serverTrust, forHost: host)
300316 return . success( Void ( ) )
301317 } catch {
302318 return . failure( error)
303319 }
304320 }
305321 }
306322
323+ // Upload progress
324+
307325 // Upload progress
308326 if let progress = progress {
309327 afRequest = afRequest. uploadProgress { progressInfo in
@@ -376,8 +394,11 @@ public class AlamofireWrapper: NSObject {
376394 // Apply server trust evaluation if security policy is set
377395 if let secPolicy = securityPolicy, let host = url. host {
378396 downloadRequest = downloadRequest. validate { _, response, _ in
397+ guard let serverTrust = response. serverTrust else {
398+ return . failure( AFError . serverTrustEvaluationFailed ( reason: . noServerTrust) )
399+ }
379400 do {
380- try secPolicy. evaluate ( response . serverTrust! , forHost: host)
401+ try secPolicy. evaluate ( serverTrust, forHost: host)
381402 return . success( Void ( ) )
382403 } catch {
383404 return . failure( error)
0 commit comments