🔀 Merge pull request #605 from ruby/parser/resp_text-backtrack-should-return-ResponseText

🐛 Return ResponseText from `resp-text` fallback

Author: nevans

lib/net/imap/response_parser.rb

@@ -1888,17 +1888,17 @@ def text?
       # We leniently re-interpret this as
       #   resp-text       = ["[" resp-text-code "]" [SP [text]] / [text]
       def resp_text
-        state = current_state
-        if lbra?
-          code = resp_text_code; rbra
-          ResponseText.new(code, SP? && text? || "")
-        else
-          ResponseText.new(nil, text? || "")
+        begin
+          state = current_state
+          if lbra?
+            code = resp_text_code; rbra
+            return ResponseText.new(code, SP? && text? || "")
+          end
+        rescue ResponseParseError => error
+          raise if /\buid-set\b/i.match? error.message
+          restore_state state
         end
-      rescue ResponseParseError => error
-        raise if /\buid-set\b/i.match? error.message
-        restore_state state
-        text
+        ResponseText.new(nil, text? || "")
       end
 
       # RFC3501 (See https://www.rfc-editor.org/errata/rfc3501):

test/net/imap/fixtures/response_parser/quirky_behaviors.yml

@@ -37,21 +37,20 @@
 
       Microsoft Exchange is issuing an invalid resp-text-code, but net-imap
       should fallback to `resp-text = text` when resp-text-code fails to parse.
-    :debug: false # current version of backtracking still prints parse_errors
     :response: "RUBY0001 OK [Error=\"Microsoft.Exchange.Data.Storage.WrongServerException:
       Cross Server access is not allowed for mailbox xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx\"
       AuthResultFromPopImapEnd=0 Proxy=XXXXXXXXXXXXX.EURXXXX.PROD.OUTLOOK.COM:1993:SSL
       MailboxBE=XXXXXXXXXXXXX.EURXXXX.PROD.OUTLOOK.COM
       Service=Imap4] AUTHENTICATE completed.\r\n"
     :expected: !ruby/struct:Net::IMAP::TaggedResponse
-      tag:  RUBY0001
+      tag: RUBY0001
       name: OK
-      data: '[Error="Microsoft.Exchange.Data.Storage.WrongServerException: Cross Server
-        access is not allowed for mailbox xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-        AuthResultFromPopImapEnd=0
-        Proxy=XXXXXXXXXXXXX.EURXXXX.PROD.OUTLOOK.COM:1993:SSL
-        MailboxBE=XXXXXXXXXXXXX.EURXXXX.PROD.OUTLOOK.COM Service=Imap4]
-        AUTHENTICATE completed.'
+      data: !ruby/struct:Net::IMAP::ResponseText
+        code:
+        text: '[Error="Microsoft.Exchange.Data.Storage.WrongServerException: Cross Server
+          access is not allowed for mailbox xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" AuthResultFromPopImapEnd=0
+          Proxy=XXXXXXXXXXXXX.EURXXXX.PROD.OUTLOOK.COM:1993:SSL MailboxBE=XXXXXXXXXXXXX.EURXXXX.PROD.OUTLOOK.COM
+          Service=Imap4] AUTHENTICATE completed.'
       raw_data: "RUBY0001 OK [Error=\"Microsoft.Exchange.Data.Storage.WrongServerException:
         Cross Server access is not allowed for mailbox xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx\"
         AuthResultFromPopImapEnd=0 Proxy=XXXXXXXXXXXXX.EURXXXX.PROD.OUTLOOK.COM:1993:SSL