Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ public final class TokenService {
private static final String TOKEN_DOC_ID_PREFIX = TOKEN_DOC_TYPE + "_";
static final int MINIMUM_BYTES = VERSION_BYTES + SALT_BYTES + IV_BYTES + 1;
static final int MINIMUM_BASE64_BYTES = Double.valueOf(Math.ceil((4 * MINIMUM_BYTES) / 3)).intValue();
static final Version VERSION_TOKENS_INDEX_INTRODUCED = Version.V_8_0_0; // TODO change upon backport
static final Version VERSION_TOKENS_INDEX_INTRODUCED = Version.V_7_1_0;
static final Version VERSION_ACCESS_TOKENS_AS_UUIDS = Version.V_7_1_0;
static final Version VERSION_MULTIPLE_CONCURRENT_REFRESHES = Version.V_7_1_0;
// UUIDs are 16 bytes encoded base64 without padding, therefore the length is (16 / 3) * 4 + ((16 % 3) * 8 + 5) / 6 chars
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import org.apache.http.HttpHeaders;
import org.apache.http.HttpHost;
import org.apache.lucene.util.LuceneTestCase;
import org.elasticsearch.Version;
import org.elasticsearch.client.Request;
import org.elasticsearch.client.RequestOptions;
Expand All @@ -25,6 +26,7 @@
import java.util.List;
import java.util.Map;

@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/pull/41673")
public class TokenBackwardsCompatibilityIT extends AbstractUpgradeTestCase {

private Collection<RestClient> twoClients = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"Get the indexed token and use if to authenticate":
- skip:
features: headers
version: "all"
reason: "Backport https://github.com/elastic/elasticsearch/pull/41673"

- do:
cluster.health:
Expand Down Expand Up @@ -59,6 +61,8 @@
"Get the indexed refreshed access token and use if to authenticate":
- skip:
features: headers
version: "all"
reason: "Backport https://github.com/elastic/elasticsearch/pull/41673"

- do:
get:
Expand Down Expand Up @@ -111,6 +115,8 @@
"Get the indexed refresh token and use it to get another access token and authenticate":
- skip:
features: headers
version: "all"
reason: "Backport https://github.com/elastic/elasticsearch/pull/41673"

- do:
get:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"Create a token and reuse it across the upgrade":
- skip:
features: headers
version: "all"
reason: "Backport https://github.com/elastic/elasticsearch/pull/41673"

- do:
cluster.health:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"Get the indexed token and use if to authenticate":
- skip:
features: headers
version: "all"
reason: "Backport https://github.com/elastic/elasticsearch/pull/41673"

- do:
cluster.health:
Expand Down Expand Up @@ -49,6 +51,8 @@
"Get the indexed refresh token and use if to get another access token and authenticate":
- skip:
features: headers
version: "all"
reason: "Backport https://github.com/elastic/elasticsearch/pull/41673"

- do:
get:
Expand Down