From c9d4e8daa234fb4c4d95af2efdd7fa8abceeb099 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Thu, 24 Mar 2022 23:50:26 +0000 Subject: [PATCH] fix: Remove "coder" user and group from systemd service This caused an inability to listen on privileged ports and read certs from LetsEncrypt. It seems more hurtful rather than helpful, so removing the restriction seems reasonable. --- cli/start.go | 28 ++++++++++++++-------------- coder.service | 6 ++---- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/cli/start.go b/cli/start.go index bd1e0f04ed418..bdae6aa0f9ace 100644 --- a/cli/start.go +++ b/cli/start.go @@ -68,11 +68,8 @@ func start() *cobra.Command { } defer listener.Close() - tlsConfig := &tls.Config{ - MinVersion: tls.VersionTLS12, - } if tlsEnable { - listener, err = configureTLS(tlsConfig, listener, tlsMinVersion, tlsClientAuth, tlsCertFile, tlsKeyFile, tlsClientCAFile) + listener, err = configureTLS(listener, tlsMinVersion, tlsClientAuth, tlsCertFile, tlsKeyFile, tlsClientCAFile) if err != nil { return xerrors.Errorf("configure tls: %w", err) } @@ -156,10 +153,12 @@ func start() *cobra.Command { handler, closeCoderd := coderd.New(options) client := codersdk.New(localURL) if tlsEnable { - // Use the TLS config here. This client is used for creating the - // default user, among other things. + // Secure transport isn't needed for locally communicating! client.HTTPClient.Transport = &http.Transport{ - TLSClientConfig: tlsConfig, + TLSClientConfig: &tls.Config{ + //nolint:gosec + InsecureSkipVerify: true, + }, } } @@ -211,15 +210,13 @@ func start() *cobra.Command { // such as via the systemd service. _ = config.URL().Write(client.URL.String()) - hasFirstUser, err := client.HasFirstUser(cmd.Context()) - if err != nil { - return xerrors.Errorf("check for first user: %w", err) - } - _, _ = fmt.Fprintf(cmd.OutOrStdout(), cliui.Styles.Paragraph.Render(cliui.Styles.Wrap.Render(cliui.Styles.Prompt.String()+`Started in `+ cliui.Styles.Field.Render("production")+` mode. All data is stored in the PostgreSQL provided! Press `+cliui.Styles.Field.Render("ctrl+c")+` to gracefully shutdown.`))+"\n") - if !hasFirstUser { + hasFirstUser, err := client.HasFirstUser(cmd.Context()) + if !hasFirstUser && err == nil { + // This could fail for a variety of TLS-related reasons. + // This is a helpful starter message, and not critical for user interaction. _, _ = fmt.Fprint(cmd.OutOrStdout(), cliui.Styles.Paragraph.Render(cliui.Styles.Wrap.Render(cliui.Styles.FocusedPrompt.String()+`Run `+cliui.Styles.Code.Render("coder login "+client.URL.String())+" in a new terminal to get started.\n"))) } } @@ -422,7 +419,10 @@ func printLogo(cmd *cobra.Command) { `) } -func configureTLS(tlsConfig *tls.Config, listener net.Listener, tlsMinVersion, tlsClientAuth, tlsCertFile, tlsKeyFile, tlsClientCAFile string) (net.Listener, error) { +func configureTLS(listener net.Listener, tlsMinVersion, tlsClientAuth, tlsCertFile, tlsKeyFile, tlsClientCAFile string) (net.Listener, error) { + tlsConfig := &tls.Config{ + MinVersion: tls.VersionTLS12, + } switch tlsMinVersion { case "tls10": tlsConfig.MinVersion = tls.VersionTLS10 diff --git a/coder.service b/coder.service index 1f6b212cd5cf5..9e1952688b206 100644 --- a/coder.service +++ b/coder.service @@ -10,15 +10,13 @@ StartLimitBurst=3 [Service] Type=notify EnvironmentFile=/etc/coder.d/coder.env -User=coder -Group=coder ProtectSystem=full ProtectHome=read-only PrivateTmp=yes PrivateDevices=yes SecureBits=keep-caps -AmbientCapabilities=CAP_IPC_LOCK CAP_NET_BIND_SERVICE -CapabilityBoundingSet=CAP_SYSLOG CAP_IPC_LOCK +AmbientCapabilities=CAP_IPC_LOCK +CapabilityBoundingSet=CAP_SYSLOG CAP_IPC_LOCK CAP_NET_BIND_SERVICE NoNewPrivileges=yes ExecStart=/usr/bin/coder start Restart=on-failure