mirror of
https://github.com/element-hq/synapse.git
synced 2026-03-30 12:55:40 +00:00
6c7e05fe20
Fixes: #8088 Previously we would perform OIDC discovery on startup, which involves making HTTP requests to the identity provider(s). If that took a long time, we would block startup. If that failed, we would crash startup. This commit: - makes the loading happen in the background on startup - makes an error in the 'preload' non-fatal (though it logs at CRITICAL for visibility) - adds a templated error page to show on failed redirects (for unavailable providers), as otherwise you get a JSON response in your navigator. - This involves introducing 2 new exception types to mark other exceptions and keep the error handling fine-grained. The machinery was already there to load-on-demand the discovery config, so when the identity provider comes back up, the discovery is reattempted and login can succeed. Signed-off-by: Olivier 'reivilibre <oliverw@matrix.org>
55 lines
1.4 KiB
Go
55 lines
1.4 KiB
Go
package dockerutil
|
|
|
|
import (
|
|
"archive/tar"
|
|
"bytes"
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/api/types/container"
|
|
"github.com/docker/docker/client"
|
|
)
|
|
|
|
// Write `data` as a file into a container at the given `path`.
|
|
//
|
|
// Internally, produces an uncompressed single-file tape archive (tar) that is sent to the docker
|
|
// daemon to be unpacked into the container filesystem.
|
|
func WriteFileIntoContainer(t *testing.T, docker *client.Client, containerID string, path string, data []byte) error {
|
|
// Create a fake/virtual tar file in memory that we can copy to the container
|
|
// via https://stackoverflow.com/a/52131297/796832
|
|
var buf bytes.Buffer
|
|
tw := tar.NewWriter(&buf)
|
|
err := tw.WriteHeader(&tar.Header{
|
|
Name: path,
|
|
Mode: 0777,
|
|
Size: int64(len(data)),
|
|
})
|
|
if err != nil {
|
|
return fmt.Errorf("WriteIntoContainer: failed to write tarball header for %s: %v", path, err)
|
|
}
|
|
_, err = tw.Write([]byte(data))
|
|
if err != nil {
|
|
return fmt.Errorf("WriteIntoContainer: failed to write tarball data for %s: %w", path, err)
|
|
}
|
|
|
|
err = tw.Close()
|
|
if err != nil {
|
|
return fmt.Errorf("WriteIntoContainer: failed to close tarball writer for %s: %w", path, err)
|
|
}
|
|
|
|
// Put our new fake file in the container volume
|
|
err = docker.CopyToContainer(
|
|
t.Context(),
|
|
containerID,
|
|
"/",
|
|
&buf,
|
|
container.CopyToContainerOptions{
|
|
AllowOverwriteDirWithFile: false,
|
|
},
|
|
)
|
|
if err != nil {
|
|
return fmt.Errorf("WriteIntoContainer: failed to copy: %s", err)
|
|
}
|
|
return nil
|
|
}
|