-
Notifications
You must be signed in to change notification settings - Fork 10
[MSCRIPTING-7] binding the session and servers helper in binding context #4
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
Open
rmannibucau
wants to merge
1
commit into
master
Choose a base branch
from
MSCRIPTING-7
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
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
55 changes: 55 additions & 0 deletions
55
src/main/java/org/apache/maven/plugins/scripting/binding/Servers.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.maven.plugins.scripting.binding; | ||
|
|
||
| import org.apache.maven.settings.Server; | ||
| import org.apache.maven.settings.Settings; | ||
| import org.apache.maven.settings.building.SettingsProblem; | ||
| import org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest; | ||
| import org.apache.maven.settings.crypto.SettingsDecrypter; | ||
| import org.apache.maven.settings.crypto.SettingsDecryptionResult; | ||
|
|
||
| import static java.util.stream.Collectors.joining; | ||
|
|
||
| /** | ||
| * Binding which enables to work with servers (from settings.xml) and in particular decipher them transparently. | ||
| */ | ||
| public class Servers { | ||
| private final Settings settings; | ||
| private final SettingsDecrypter settingsDecrypter; | ||
|
|
||
| public Servers(Settings settings, SettingsDecrypter settingsDecrypter) { | ||
| this.settings = settings; | ||
| this.settingsDecrypter = settingsDecrypter; | ||
| } | ||
|
|
||
| public Server find(String id) { | ||
| final Server server = settings.getServer(id); | ||
| if (server == null) { | ||
| return null; | ||
| } | ||
| final SettingsDecryptionResult result = settingsDecrypter.decrypt(new DefaultSettingsDecryptionRequest(server)); | ||
| if (!result.getProblems().isEmpty()) { | ||
| throw new IllegalStateException( | ||
| result.getProblems().stream().map(SettingsProblem::toString).collect(joining("\n"))); | ||
| } | ||
| final Server decrypted = result.getServer(); | ||
| return decrypted == null ? server : decrypted; | ||
| } | ||
| } |
This file contains hidden or 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
153 changes: 153 additions & 0 deletions
153
src/test/java/org/apache/maven/plugins/scripting/binding/ServersTest.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.maven.plugins.scripting.binding; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import org.apache.maven.settings.Proxy; | ||
| import org.apache.maven.settings.Server; | ||
| import org.apache.maven.settings.Settings; | ||
| import org.apache.maven.settings.building.SettingsProblem; | ||
| import org.apache.maven.settings.crypto.DefaultSettingsDecrypter; | ||
| import org.apache.maven.settings.crypto.SettingsDecryptionRequest; | ||
| import org.apache.maven.settings.crypto.SettingsDecryptionResult; | ||
| import org.codehaus.plexus.PlexusContainerException; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.sonatype.plexus.components.cipher.DefaultPlexusCipher; | ||
| import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher; | ||
|
|
||
| import static java.util.Collections.emptyList; | ||
| import static java.util.Collections.singletonList; | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertNull; | ||
|
|
||
| // sanity check, decrypter impl is mocked for simplicity | ||
| public class ServersTest { | ||
| @Test | ||
| public void missing() throws Exception { | ||
| assertNull(new Servers( | ||
| new Settings(), | ||
| new DefaultSettingsDecrypter(new DefaultSecDispatcher(new DefaultPlexusCipher()))) | ||
| .find("test")); | ||
| } | ||
|
|
||
| @Test | ||
| public void clear() throws PlexusContainerException { | ||
| final Server server = new Server(); | ||
| server.setId("test"); | ||
| server.setUsername("clear"); | ||
| server.setPassword("12345"); | ||
| assertEquals( | ||
| "12345", | ||
| new Servers( | ||
| new Settings() { | ||
| @Override | ||
| public List<Server> getServers() { | ||
| return singletonList(server); | ||
| } | ||
| }, | ||
| new DefaultSettingsDecrypter(new DefaultSecDispatcher(new DefaultPlexusCipher())) { | ||
| @Override | ||
| public SettingsDecryptionResult decrypt(SettingsDecryptionRequest request) { | ||
| return new SettingsDecryptionResult() { | ||
| @Override | ||
| public Server getServer() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public List<SettingsProblem> getProblems() { | ||
| return emptyList(); | ||
| } | ||
|
|
||
| @Override | ||
| public List<Server> getServers() { | ||
| throw new UnsupportedOperationException(); | ||
| } | ||
|
|
||
| @Override | ||
| public Proxy getProxy() { | ||
| throw new UnsupportedOperationException(); | ||
| } | ||
|
|
||
| @Override | ||
| public List<Proxy> getProxies() { | ||
| throw new UnsupportedOperationException(); | ||
| } | ||
| }; | ||
| } | ||
| }) | ||
| .find("test") | ||
| .getPassword()); | ||
| } | ||
|
|
||
| @Test | ||
| public void ciphered() throws PlexusContainerException { | ||
| final Server server = new Server(); | ||
| server.setId("test"); | ||
| server.setUsername("not-clear"); | ||
| server.setPassword("ciphered"); | ||
| assertEquals( | ||
| "12345", | ||
| new Servers( | ||
| new Settings() { | ||
| @Override | ||
| public List<Server> getServers() { | ||
| return singletonList(server); | ||
| } | ||
| }, | ||
| new DefaultSettingsDecrypter(new DefaultSecDispatcher(new DefaultPlexusCipher())) { | ||
| @Override | ||
| public SettingsDecryptionResult decrypt(SettingsDecryptionRequest request) { | ||
| return new SettingsDecryptionResult() { | ||
| @Override | ||
| public Server getServer() { | ||
| final Server result = new Server(); | ||
| result.setId(server.getId()); | ||
| result.setUsername(server.getUsername()); | ||
| result.setPassword("12345"); | ||
| return result; | ||
| } | ||
|
|
||
| @Override | ||
| public List<SettingsProblem> getProblems() { | ||
| return emptyList(); | ||
| } | ||
|
|
||
| @Override | ||
| public List<Server> getServers() { | ||
| throw new UnsupportedOperationException(); | ||
| } | ||
|
|
||
| @Override | ||
| public Proxy getProxy() { | ||
| throw new UnsupportedOperationException(); | ||
| } | ||
|
|
||
| @Override | ||
| public List<Proxy> getProxies() { | ||
| throw new UnsupportedOperationException(); | ||
| } | ||
| }; | ||
| } | ||
| }) | ||
| .find("test") | ||
| .getPassword()); | ||
| } | ||
| } | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why are we using org.sonatype instead of org.codehaus.plexus?