-
Notifications
You must be signed in to change notification settings - Fork 29
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
✨ Add basic ESearch support #333
Open
nevans
wants to merge
6
commits into
ruby:master
Choose a base branch
from
nevans:basic-esearch-support
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
+927
−15
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FWIW: I discovered in testing that Yahoo does not return ESEARCH results when |
nevans
force-pushed
the
basic-esearch-support
branch
4 times, most recently
from
October 25, 2024 21:21
59137e9
to
7dc2006
Compare
nevans
added a commit
to nevans/net-imap
that referenced
this pull request
Nov 8, 2024
This affects `#search`, `#uid_search`, `#sort`, `#uid_sort`, `#thread`, and `#uid_thread`. Prior to this, sending a parenthesized list in the search criteria for any of these commands required the use of strings, which are converted to `RawData`, which has security implications with untrusted inputs. With this change, arrays will only be converted into SequenceSet when _every_ element in the array is a valid SequenceSet input. Otherwise, the array will be left alone, which allows us to send parenthesized lists without using strings and RawData. For example, some searches this change enables: * Combining criteria to pass into `OR`, `NOT`, `FUZZY`, etc. * `search(["not", %w(flagged unread)])` converts to: `SEARCH not (flagged unread)` * Adding return options (we should also add a return kwarg). * `uid_search(["RETURN", ["PARTIAL", 1..50], "UID", 12345..67890])` converts to: `UID SEARCH RETURN (PARTIAL 1:50) UID 12345:67890` * Note that `PARTIAL` supports negative ranges, which can't be coerced to SequenceSet. They'll need to be sent as strings, for now. * Note that searches with return options should return ESEARCH results, which are currently unsupported. See ruby#333. This _should_ be backward compatible: previously these inputs would raise an exception.
nevans
force-pushed
the
basic-esearch-support
branch
2 times, most recently
from
November 8, 2024 23:02
d86e849
to
efd2760
Compare
nevans
force-pushed
the
basic-esearch-support
branch
from
November 11, 2024 19:01
efd2760
to
0587646
Compare
nevans
force-pushed
the
basic-esearch-support
branch
6 times, most recently
from
November 25, 2024 17:10
fd7b0f9
to
a535b1f
Compare
nevans
force-pushed
the
basic-esearch-support
branch
10 times, most recently
from
December 14, 2024 22:17
acdb6f8
to
d38357b
Compare
nevans
force-pushed
the
basic-esearch-support
branch
3 times, most recently
from
December 15, 2024 23:14
f4cabfa
to
b486078
Compare
Parses +ESEARCH+ into ESearchResult, with support for generic RFC4466 syntax and RFC4731 `ESEARCH` return data. For compatibility, `ESearchResult#to_a` returns an array of integers (sequence numbers or UIDs) whenever any `ALL` result is available.
If the server returns both `ESEARCH` and `SEARCH`, both are cleared from the responses hash, but only the `ESEARCH` is returned. When the server doesn't send any search responses: If return options are passed, return an empty ESearchResult. It will have the appropriate `tag` and `uid` values, but no `data`. Otherwise return an empty `SearchResult`.
This also extracts the `return` kwarg out of the `criteria` array, so it can be processed differently.
This looks like a bug in prism: ``` $ rbenv shell 3.4.0-rc1 $ ruby -e 'pp ([["foo"]] in [/\Afoo\b/i | [/\Afoo\z/i, *]])' false $ ruby --parser=parse.y -e 'pp ([["foo"]] in [/\Afoo\b/i | [/\Afoo\z/i, *]])' true ```
nevans
force-pushed
the
basic-esearch-support
branch
from
December 15, 2024 23:22
b486078
to
35ab834
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Parse
ESEARCH
intoESearchResult
, with support for generic RFC4466 syntax and RFC4731ESEARCH
return data. For compatibility,ESearchResult#to_a
returns an array of integers (sequence numbers or UIDs) whenever anyALL
result is available.Gather ESEARCH response to #search/#uid_search. If the server returns both
ESEARCH
andSEARCH
, both are cleared from the responses hash, but only theESEARCH
is returned.When the server doesn't send any search responses and return options are passed, return an empty ESearchResult. This empty result will have the appropriate
tag
anduid
values, but nodata
. Otherwise return an emptySearchResult
.Add keyword param for search return options, and process it differently from
criteria
. Also extract areturn
argument out of thecriteria
array, and process it like thereturn
kwarg. (FYI: I discovered https://bugs.ruby-lang.org/issues/20956 while working on this).TODO list
ESearchResponse < Data.define(:tag, :uid, :data)
#data
is a generic Array of[name, value]
pairs. Not usingHash
because some names can be repeated, and the order is significant even between different names.data.assoc(name)
can be used for quick lookup.ExtensionData
will be used for unknown return dataSearchResult
:#to_a
returns numbers from#all
,#partial
, or an empty array#modseq
ESEARCH
return data:#min
,#max
,#all
,#count
ESEARCH
+CONDSEQ
:#modseq
ESEARCH
intoESearchResponse
ExtensionData.new(tagged_ext_value)
ESEARCH
andCONDSTORE
(MIN
,MAX
,ALL
,COUNT
,MODSEQ
): parse as Integer or SequenceSet#search
and#uid_search
return
kwarg: must be an Array, and process differently thancriteria
.return
from arraycriteria
and process differently thancriteria
ESearchResponse
rather than an emptySearchResponse
.ESEARCH
responses in addition toSEARCH
responses. If server sends both, prefer to return theESEARCH
responses.charset
kwarg to#search
,#uid_search
TODO: Remove the following from this PR (make new PRs for them):
ESearchResponse
methods and data classes#to_a
returning numbers from#partial
#partial
ESearchResponse::PartialResult
#updates
#relevancy
PARTIAL
,ADDTO
,REMOVEFROM
,RELEVANCY
as genericExtensionData
Related future PRs:
PARTIAL
(RFC9394, RFC5267)CONTEXT=*
(RFC5267)SequenceSet
?ESORT
(RFC5267)SEARCH=FUZZY
(RFC6203)#relevancy
scores with numbers from#all
or#partial
#to_a
,#all
,#partial
#numbers
#prepend
- like#append
but adds to the beginning#insert(index, value)
#remove(index_or_range)
#[]
,#at
,#slice
#zip
with array of numbers (forRELEVANCY
)#zip
with another SequenceSet (forCOPYUID
)