Issue #9: Handled some expects()/unwraps() (#380)

* Handled some expects()/unwraps() * Box workload in variant
istio · Feb 8, 2023 · e2f27d6 · e2f27d6
1 parent 3622b13
commit e2f27d6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/proxy.rs b/src/proxy.rs
@@ -155,6 +155,9 @@ pub enum Error {
 
     #[error("attempted recursive call to ourselves")]
     SelfCall,
+
+    #[error("no gateway address: {0}")]
+    NoGatewayAddress(Box<crate::workload::Workload>),
 }
 
 // TLS record size max is 16k. But we also have a H2 frame header, so leave a bit of room for that.

diff --git a/src/proxy/outbound.rs b/src/proxy/outbound.rs
@@ -367,6 +367,9 @@ impl OutboundConnection {
                 request_type: RequestType::ToServerWaypoint,
             });
         }
+        if us.workload.gateway_address.is_none() {
+            return Err(Error::NoGatewayAddress(Box::new(us.workload.clone())));
+        }
         // For case source client and upstream server are on the same node
         if !us.workload.node.is_empty()
             && self.pi.cfg.local_node == Some(us.workload.node.clone())
@@ -387,7 +390,7 @@ impl OutboundConnection {
                 gateway: SocketAddr::from((
                     us.workload
                         .gateway_address
-                        .expect("todo: refactor gateway ip handling")
+                        .expect("gateway address confirmed")
                         .ip(),
                     15008,
                 )),
@@ -407,7 +410,7 @@ impl OutboundConnection {
             gateway: us
                 .workload
                 .gateway_address
-                .expect("todo: refactor gateway ip handling"),
+                .expect("gateway address confirmed"),
             direction: Direction::Outbound,
             request_type: RequestType::Direct,
         })

diff --git a/src/tls/boring.rs b/src/tls/boring.rs
@@ -162,7 +162,7 @@ impl Certs {
             .cert
             .not_after
             .duration_since(self.cert.not_before)
-            .unwrap()
+            .unwrap_or_else(|_| std::time::Duration::from_secs(0))
             / 2;
         // If now() is earlier than not_before, we need to refresh ASAP, so return 0.
         let elapsed = SystemTime::now()