Skip to content
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

Jump to bottom

Feature/hg hooks over tcp #1416

Merged
merged 31 commits into from
Nov 27, 2020
Merged

Feature/hg hooks over tcp #1416

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
2331766
Implement mercurial hooks over sockets
sdorra Nov 6, 2020
d518af4
Refactor nearly the whole scm-hg-plugin for new hook implementation
sdorra Nov 7, 2020
d86b2f7
Disable xsrf for mercurial hook tokens
sdorra Nov 8, 2020
36aa059
Disable shiro session storage
sdorra Nov 8, 2020
e774c77
Rename mercurial hooks to match python coding specs
sdorra Nov 8, 2020
5270195
Improve logging for mercurial hooks
sdorra Nov 10, 2020
5118294
Fix multiple accessor threads
sdorra Nov 10, 2020
e038eeb
Improve connection handling of mercurial hook python client
sdorra Nov 10, 2020
70969b5
Update changelog
sdorra Nov 10, 2020
8b4f92f
Remove version script because it is not longer required
sdorra Nov 10, 2020
3fe678e
Remove disableHookSSLValidation field from mercurial settings form
sdorra Nov 10, 2020
84aa8b4
Update pull request link
sdorra Nov 10, 2020
58a0c51
Merge with develop branch
sdorra Nov 18, 2020
c2df6d2
Update storybook components to be compatible with jest 26
sdorra Nov 18, 2020
5311cd5
Fix test for jest 26
sdorra Nov 18, 2020
b6c5a25
Fixed missing messages on exceptions during hook
sdorra Nov 19, 2020
982743e
Fix review findings
sdorra Nov 19, 2020
29faa5e
Fix review findings
sdorra Nov 19, 2020
1311061
Pass transaction id from request to mercurial hooks
sdorra Nov 19, 2020
0b96e7d
Merge branch 'develop' into feature/hg_hooks_over_tcp
eheimbuch Nov 19, 2020
0841a0a
Merge branch 'feature/hg_hooks_over_tcp' of github.com:scm-manager/sc…
sdorra Nov 19, 2020
959dfb8
Fix compiler error
sdorra Nov 19, 2020
33e7a13
Merge branch 'develop' into feature/hg_hooks_over_tcp
pfeuffer Nov 20, 2020
73b2c4a
Do not expose internal exception messages
sdorra Nov 21, 2020
c0ae910
Implement more robust socket hook protocol
sdorra Nov 22, 2020
7357d83
Use DataInputStream and DataOutputStream instead of manual reading an…
sdorra Nov 27, 2020
3e19f28
Do not use socket.MSG_WAITALL
sdorra Nov 27, 2020
8ee8c8b
Merge branch 'develop' into feature/hg_hooks_over_tcp
sdorra Nov 27, 2020
136cdbb
Fix broken HgVersionCommand
sdorra Nov 27, 2020
52f26ab
Merge with develop branch
sdorra Nov 27, 2020
d732100
Fix typo
pfeuffer Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased
### Changed
- Send mercurial hook callbacks over separate tcp socket instead of http ([#1416](https://github.com/scm-manager/scm-manager/pull/1416))

### Fixed
- Error on repository initialization with least-privilege user ([#1414](https://github.com/scm-manager/scm-manager/pull/1414))

Expand Down
6 changes: 3 additions & 3 deletions scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

package sonia.scm.api.v2.resources;

import de.otto.edison.hal.HalRepresentation;
Expand All @@ -30,9 +30,10 @@
import lombok.NoArgsConstructor;
import lombok.Setter;

@NoArgsConstructor
@Getter
@Setter
@NoArgsConstructor
@SuppressWarnings("java:S2160") // we don't need equals for dto
public class HgConfigDto extends HalRepresentation {

private boolean disabled;
Expand All @@ -44,7 +45,6 @@ public class HgConfigDto extends HalRepresentation {
private boolean useOptimizedBytecode;
private boolean showRevisionInId;
private boolean enableHttpPostArgs;
private boolean disableHookSSLValidation;

@Override
@SuppressWarnings("squid:S1185") // We want to have this method available in this package
Expand Down