Add application service support to blueprints - #74

Merged

kegsay merged 7 commits into

eric/appservice-support

Feb 23, 2021

MadLittleMods commented Feb 22, 2021•
edited
Loading

Contributor

Add application service support to blueprints

Only supports defining a basic app service
In tests, you can use the app service as_token to interact with the homserver API
Does not support defining the namespaces part of the app service registration config
Does not support a mocked/stubbed actual app service that the homeserver calls back to at the URL

Split out from #68

Add application service support to blueprints

cf4d8e9

Split out from #68

MadLittleMods force-pushed the eric/appservice-support branch from 79216e5 to cf4d8e9Compare

February 22, 2021 08:00

MadLittleMods commented

View reviewed changes

internal/docker/builder.go Outdated

MadLittleMods commented

View reviewed changes

internal/docker/builder.go

MadLittleMods added 2 commits

February 22, 2021 02:11

Revert always showing logs

ccb20e6

Add comment doc

12e6ec0

MadLittleMods mentioned this pull request

Add tests for MSC2716 and backfilling history #68

Merged

11 tasks

MadLittleMods requested a review from kegsay

February 22, 2021 08:14

kegsay reviewed

View reviewed changes

internal/b/hs_with_application_service.go

kegsay reviewed

View reviewed changes

internal/b/blueprints.go Outdated

kegsay reviewed

View reviewed changes

internal/b/blueprints.go Outdated

kegsay reviewed

View reviewed changes

internal/docker/builder.go Outdated

kegsay reviewed

View reviewed changes

internal/docker/builder.go Outdated

kegsay reviewed

View reviewed changes

internal/docker/builder.go

kegsay reviewed

View reviewed changes

internal/docker/builder.go Outdated

+ var buf bytes.Buffer
+ tw := tar.NewWriter(&buf)
+ err = tw.WriteHeader(&tar.Header{
+ Name: fmt.Sprintf("/appservices/%s.yaml", asID),

kegsayFeb 22, 2021

Member

Please can we do filepath escapes here, as I would like to in the future allow untrusted Blueprint input.

MadLittleModsFeb 22, 2021

ContributorAuthor

I assume you mean using client.GjsonEscape?

kegsayFeb 23, 2021

Member

I mean path escaping so you can't have an asID like ../../../etc/passwd

kegsay approved these changes

View reviewed changes

kegsay left a comment

Member

Love it, just a few minor issues to resolve!

Some nits and remove the volume paths

1b19990

 - Seems like the `Volumes` syntax is to create an anonymous volume, https://stackoverflow.com/a/58916037/796832
- And lots of people not knowing what `Volumes` syntax is or what to do. Seems like Mounts is the thing to use
- fsouza/go-dockerclient#155
- https://stackoverflow.com/questions/55718603/golang-docker-library-mounting-host-directory-volumes
- https://stackoverflow.com/questions/48470194/defining-a-mount-point-for-volumes-in-golang-docker-sdk

MadLittleMods force-pushed the eric/appservice-support branch from 5ca8a8a to 1b19990Compare

February 22, 2021 22:27

MadLittleMods commented

View reviewed changes

internal/docker/builder.go

MadLittleMods added 2 commits

February 22, 2021 17:20

Address review and add comment docs

c1f07c2

Revert lint change already in other PR#73

169a60d

MadLittleMods requested a review from kegsay

February 23, 2021 00:44

Path escape AS IDs to avoid directory traversal attacks

c6155af

kegsay commented Feb 23, 2021

Member

LGTM

kegsay merged commit 5d63375 into master

MadLittleMods commented Feb 23, 2021

ContributorAuthor

Woot! Thanks for the review @kegsay 🐊

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