Skip to content

Merge upstream square/go-jose:v2 into go-jose/go-jose:v2 while preserving existing history#28

Merged
jsha merged 24 commits intogo-jose:v2from
pgporada:v2
Jan 23, 2023
Merged

Merge upstream square/go-jose:v2 into go-jose/go-jose:v2 while preserving existing history#28
jsha merged 24 commits intogo-jose:v2from
pgporada:v2

Conversation

@pgporada
Copy link
Copy Markdown
Collaborator

@pgporada pgporada commented Jan 19, 2023

go-jose/go-jose:v2 was forked from square/go-jose:v2 at commit 3a5ee095dcb5030a9de84fb92c222ac652fff176 Since that commit, square/go-jose:v2 and go-jose/go-jose:v2 diverged and had development in each respective v2 branch. Now that Let's Encrypt are the stewards of this repository, we want to merge the divergent histories together back into one cohesive history. Doing this will allow current users of square/go-jose:v2 using tagged versions v2.5.1 or v2.6.0 to switch to go-jose/go-jose:v2 and eventually use those same tags once they've been cut. This is nice because as development continues on go-jose/go-jose:v3, v2 users will have one less upgrade to perform in their own modules files.

For the pedantic, this could have been accomplished several ways. Here's two such ways:

$ git clone git@github.com:pgporada/go-jose pgj
$ cd pgj
$ git remote add square https://github.com/square/go-jose
$ git fetch square
$ git checkout --track origin/v2
$ git merge square/v2
# fix any merge conflicts
$ git commit
$ git push

or

$ git clone git@github.com:pgporada/go-jose.git pgj
$ cd pgj
$ git remote add square https://github.com/square/go-jose
$ git remote update
$ git fetch --all
$ git checkout --track origin/v2
$ git commit-tree HEAD^{tree} -p c9ac459 -p 28539ee -m "reparenting"
==> outputs a merge commit hash with our new parent commits such as b6e792685a543633bf4d4f9f9cf17bbf02c633a4
$ git reset --soft b6e792685a543633bf4d4f9f9cf17bbf02c633a4
$ git push

evanj and others added 24 commits June 29, 2020 22:26
The JWT NumericDate type is a Unix/POSIX timestamp, which ignores leap
seconds as far as I know. This said "including leap seconds" which was
confusing. Use "ignoring leap seconds" which is direct from the RFC:

RFC7519 Section 2 states:
https://tools.ietf.org/html/rfc7519#section-2

    A JSON numeric value representing the number of seconds from
    1970-01-01T00:00:00Z UTC until the specified UTC date/time,
    ignoring leap seconds.  This is equivalent to the IEEE Std 1003.1,
    2013 Edition [POSIX.1] definition "Seconds Since the Epoch", in
    which each day is accounted for by exactly 86400 seconds, other
    than that non-integer values can be represented.
Regenerate X.509 cert with SAN extension (v2)
Typo fixes for doc_test.go, cbc_hmac.go and other places
Unmarshal JSON integer numbers into `interface{}`  as `int64`
Add support for non-pointer jose.JSONWebKeySet
fix: add ExtraHeaders from options object to multi encrypter
@pgporada
Copy link
Copy Markdown
Collaborator Author

pgporada commented Jan 24, 2023

We noticed something odd with square/go-jose after this was merged.

The upstream square/go-jose repo has a commit on its v2.6.0 tag which does not exist on the underlying v2 branch
Compare https://github.com/square/go-jose/commits/v2 (the contents of the v2 branch) with https://github.com/square/go-jose/commits/v2.6.0 (the contents of the v2.6.0 tag)

You'll see this missing commit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants