Retry getobject (#300)

* Support automatic retries with GetObject when soft errors are returned by the server * Detect XML properly and don't get tripped up with other content types like application/vnd.openxmlformats-officedocument.wordprocessingml.document
troydavisson · Feb 16, 2022 · 83ec09c · 83ec09c
1 parent 4497a35
commit 83ec09c
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/src/Parsers/GetObject/Single.php b/src/Parsers/GetObject/Single.php
@@ -44,7 +44,7 @@ protected function isError(Response $response)
         }
 
         $content_type = $response->getHeader('Content-Type');
-        if ($content_type and strpos($content_type, 'xml') !== false) {
+        if ($content_type and strpos($content_type, 'text/xml') !== false) {
             $xml = $response->xml();
 
             if (isset($xml['ReplyCode']) and $xml['ReplyCode'] != 0) {

diff --git a/src/Session.php b/src/Session.php
@@ -438,6 +438,36 @@ protected function request($capability, $options = [], $is_retry = false)
             }
         }
 
+        if ($this->getConfiguration()->readOption('getobject_auto_retry') and $capability == 'GetObject') {
+            if (stripos($response->getHeader('Content-Type'), 'multipart') !== false) {
+                $parser = $this->grab(Strategy::PARSER_OBJECT_MULTIPLE);
+                $collection = $parser->parse($response);
+            } else {
+                $collection = new Collection;
+                $parser = $this->grab(Strategy::PARSER_OBJECT_SINGLE);
+                $object = $parser->parse($response);
+                $collection->push($object);
+            }
+
+            /** @var BaseObject[] $collection */
+            foreach ($collection as $object) {
+                if ($object->isError() and $object->getError()->getCode() == '20037') {
+                    if ($is_retry) {
+                        // this attempt was already a retry, so let's stop here
+                        $this->debug("Request retry failed.  Won't retry again");
+                        // let this error fall through to the more generic handling below
+                    } else {
+                        $this->debug("RETS 20037 re-auth requested");
+                        $this->debug("Logging in again and retrying request");
+                        // see if logging in again and retrying the request works
+                        $this->Login();
+
+                        return $this->request($capability, $options, true);
+                    }
+                }
+            }
+        }
+
         return $response;
     }