Merge pull request #23 from profmaad/master

Fix login and screenshot functionality for iDRAC7/8
spotify · Nov 2, 2015 · 9273424 · 9273424
2 parents 1ab2aa1 + 8f53267
commit 9273424
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/lib/moob.rb b/lib/moob.rb
@@ -82,8 +82,8 @@ def self.show_console_preview lom
   def self.save_console_preview lom
     imgfile, headers = lom.fetch_console_preview
 
-    timestamp=Time.parse(headers['Last-modified'])
-    fileext=headers['Content-type'].split('/')[1]
+    timestamp=Time.parse(headers['Last-modified'] || headers['Last-Modified'])
+    fileext=(headers['Content-type'] || headers['Content-Type']).split('/')[1]
 
     filename="#{lom.hostname}-#{timestamp.utc.iso8601(0)}.#{fileext}"
 

diff --git a/lib/moob/idrac6.rb b/lib/moob/idrac6.rb
@@ -188,7 +188,9 @@ def fetch_console_preview
     req = @session.get_file "capconsole/scapture0.png?#{Time.now.utc.to_i}", imgfile.path
 
     raise ResponseError.new req unless req.status == 200
-    raise UnexpectedContentError.new req unless req.headers['Content-type'] =~ /image\//
+
+    content_type = req.headers['Content-type'] || req.headers['Content-Type']
+    raise "Unexpected content type #{content_type}, expected 'image/' prefix" unless content_type =~ /image\//
 
     return imgfile, req.headers
   end

diff --git a/lib/moob/idrac7.rb b/lib/moob/idrac7.rb
@@ -32,6 +32,8 @@ def authenticate
     @session.handle_cookies nil
     # Needed for new version of iDrac emb web server to even responde
     @session.headers['Accept-Language'] = 'en-US,en;q=0.8,sv;q=0.6'
+    # idrac7 responds with a 404 if the request is sent for html is sent without encoding headers
+    @session.headers['Accept-Encoding'] = 'gzip,deflate,sdch'
 
     login = @session.get 'login.html'
 
@@ -223,7 +225,9 @@ def fetch_console_preview
     req = @session.get_file "capconsole/scapture0.png?#{Time.now.utc.to_i}", imgfile.path
 
     raise ResponseError.new req unless req.status == 200
-    raise UnexpectedContentError.new req unless req.headers['Content-type'] =~ /image\//
+
+    content_type = req.headers['Content-type'] || req.headers['Content-Type']
+    raise "Unexpected content type #{content_type}, expected 'image/' prefix" unless content_type =~ /image\//
 
     return imgfile, req.headers
   end

diff --git a/lib/moob/idrac8.rb b/lib/moob/idrac8.rb
@@ -242,7 +242,9 @@ def fetch_console_preview
     req = @session.get_file "capconsole/scapture0.png?#{Time.now.utc.to_i}", imgfile.path
 
     raise ResponseError.new req unless req.status == 200
-    raise UnexpectedContentError.new req unless req.headers['Content-type'] =~ /image\//
+
+    content_type = req.headers['Content-type'] || req.headers['Content-Type']
+    raise "Unexpected content type #{content_type}, expected 'image/' prefix" unless content_type =~ /image\//
 
     return imgfile, req.headers
   end