Skip to content

Allowing the gitlab token to be 20 characters or more #233

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.

Sign up for GitHub

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

Merged
jetersen merged 1 commit into from
Aug 23, 2022
Merged

Allowing the gitlab token to be 20 characters or more #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ credentials:
- gitlabPersonalAccessToken:
scope: SYSTEM
id: "i<3GitLab"
token: "XfsqZvVtAx5YCph5bq3r" # gitlab personal access token
token: "glpat-XfsqZvVtAx5YCph5bq3r" # gitlab personal access token

unclassified:
gitLabServers:
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/jenkins/plugins/gitlabserverconfig/credentials/PersonalAccessTokenImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public Secret getToken() {
@Symbol("gitlabPersonalAccessToken")
public static class DescriptorImpl extends CredentialsDescriptor {

private static final int GITLAB_ACCESS_TOKEN_LENGTH = 20;
private static final int GITLAB_ACCESS_TOKEN_MINIMAL_LENGTH = 20;

/**
* {@inheritDoc}
Expand All @@ -87,11 +87,11 @@ public String getDisplayName() {
public FormValidation doCheckToken(@QueryParameter String value) {
Secret secret = Secret.fromString(value);
if (StringUtils.equals(value, secret.getPlainText())) {
if (value.length() != GITLAB_ACCESS_TOKEN_LENGTH) {
if (value.length() < GITLAB_ACCESS_TOKEN_MINIMAL_LENGTH) {
return FormValidation
.error(Messages.PersonalAccessTokenImpl_tokenWrongLength());
}
} else if (secret.getPlainText().length() != GITLAB_ACCESS_TOKEN_LENGTH) {
} else if (secret.getPlainText().length() < GITLAB_ACCESS_TOKEN_MINIMAL_LENGTH) {
return FormValidation.error(Messages.PersonalAccessTokenImpl_tokenWrongLength());
}
return FormValidation.ok();
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/io/jenkins/plugins/gitlabserverconfig/credentials/Messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
PersonalAccessTokenImpl.displayName=GitLab Personal Access Token
PersonalAccessTokenImpl.tokenRequired=Token required
PersonalAccessTokenImpl.tokenWrongLength=Token should be 20 characters long
PersonalAccessTokenImpl.tokenWrongLength=Token should be at least 20 characters long
4 changes: 2 additions & 2 deletions src/test/java/io/jenkins/plugins/gitlabserverconfig/casc/ConfigurationAsCodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ public void should_support_configuration_as_code() {
);
assertThat(credentials, hasSize(1));
final PersonalAccessTokenImpl credential = credentials.get(0);
assertThat(credential.getToken().getPlainText(), is("XfsqZvVtAx5YCph5bq3r"));
assertThat(credential.getToken().getEncryptedValue(), is(not("XfsqZvVtAx5YCph5bq3r")));
assertThat(credential.getToken().getPlainText(), is("glpat-XfsqZvVtAx5YCph5bq3r"));
assertThat(credential.getToken().getEncryptedValue(), is(not("glpat-XfsqZvVtAx5YCph5bq3r")));
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/io/jenkins/plugins/gitlabserverconfig/casc/configuration-as-code.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ credentials:
- gitlabPersonalAccessToken:
scope: SYSTEM
id: "i<3GitLab"
token: "XfsqZvVtAx5YCph5bq3r"
token: "glpat-XfsqZvVtAx5YCph5bq3r"

unclassified:
gitLabServers:
Expand Down