Error handling and style

Author: mpizala

modules/exploits/linux/http/docker_daemon_tcp.rb

@@ -54,7 +54,7 @@ def check_image(image_id)
       'method'  => 'GET',
       'uri'     => normalize_uri('images', 'json')
     )
-    return unless res and res.code == 200 and res.body.include? image_id
+    return unless res && res.code == 200 && res.body.include?(image_id)
 
     res
   end
@@ -65,7 +65,7 @@ def pull_image(image_id)
       'method'  => 'POST',
       'uri'     => normalize_uri('images', 'create?fromImage=' + image_id)
     )
-    return unless res.code == 200
+    return unless res && res.code == 200
 
     res
   end
@@ -125,7 +125,7 @@ def check
       return Exploit::CheckCode::Unknown
     end
 
-    if res and res.code == 200 and res.headers['Server'].include? 'Docker'
+    if res && res.code == 200 && res.headers['Server'].include?('Docker')
       return Exploit::CheckCode::Vulnerable
     end
 
@@ -181,7 +181,7 @@ def exploit
 
     # delete container
     deleted_container = false
-    if res_wait.code == 200
+    if res_wait && res_wait.code == 200
       vprint_status("The docker container has been stopped, now trying to remove it")
       del_container(container_id)
       deleted_container = true