-
Notifications
You must be signed in to change notification settings - Fork 72
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #281 from SeanHai/auth
support enable etcd auth
- Loading branch information
Showing
7 changed files
with
193 additions
and
3 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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,50 @@ | ||
| /* | ||
| * Copyright (c) 2023 NetEase Inc. | ||
| * | ||
| * Licensed 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. | ||
| */ | ||
|
|
||
| /* | ||
| * Project: Curveadm | ||
| * Created Date: 2023-08-02 | ||
| * Author: wanghai (SeanHai) | ||
| */ | ||
|
|
||
| package scripts | ||
|
|
||
| var ENABLE_ETCD_AUTH = ` | ||
| #!/usr/bin/env bash | ||
| if [ $# -ne 3 ]; then | ||
| echo "Usage: $0 endpoints username password" | ||
| exit 1 | ||
| fi | ||
| endpoints=$1 | ||
| username=$2 | ||
| password=$3 | ||
| root_user=root | ||
| # create root user | ||
| etcdctl --endpoints=${endpoints} user add ${root_user}:${password} && \ | ||
| etcdctl --endpoints=${endpoints} user grant-role ${root_user} root || exit 1 | ||
| # create user if not root | ||
| if [ "${username}" != "${root_user}" ]; then | ||
| etcdctl --endpoints=${endpoints} user add ${username}:${password} && \ | ||
| etcdctl --endpoints=${endpoints} user grant-role ${username} root || exit 1 | ||
| fi | ||
| # enable auth | ||
| etcdctl --endpoints=${endpoints} auth enable --user=${root_user}:${password} || exit 1 | ||
| ` |
This file contains 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,106 @@ | ||
| /* | ||
| * Copyright (c) 2023 NetEase Inc. | ||
| * | ||
| * Licensed 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. | ||
| */ | ||
|
|
||
| /* | ||
| * Project: Curveadm | ||
| * Created Date: 2023-08-02 | ||
| * Author: wanghai (SeanHai) | ||
| */ | ||
|
|
||
| package common | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/opencurve/curveadm/cli/cli" | ||
| "github.com/opencurve/curveadm/internal/configure/topology" | ||
| "github.com/opencurve/curveadm/internal/errno" | ||
| "github.com/opencurve/curveadm/internal/task/context" | ||
| "github.com/opencurve/curveadm/internal/task/scripts" | ||
| "github.com/opencurve/curveadm/internal/task/step" | ||
| "github.com/opencurve/curveadm/internal/task/task" | ||
| tui "github.com/opencurve/curveadm/internal/tui/common" | ||
| ) | ||
|
|
||
| func checkEnableEtcdAuthStatus(success *bool, out *string) step.LambdaType { | ||
| return func(ctx *context.Context) error { | ||
| if !*success { | ||
| return errno.ERR_ENABLE_ETCD_AUTH_FAILED.S(*out) | ||
| } | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| func NewEnableEtcdAuthTask(curveadm *cli.CurveAdm, dc *topology.DeployConfig) (*task.Task, error) { | ||
| serviceId := curveadm.GetServiceId(dc.GetId()) | ||
| containerId, err := curveadm.GetContainerId(serviceId) | ||
| if curveadm.IsSkip(dc) { | ||
| return nil, nil | ||
| } else if err != nil { | ||
| return nil, err | ||
| } | ||
| hc, err := curveadm.GetHost(dc.GetHost()) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| var success bool | ||
| var out string | ||
| host, role := dc.GetHost(), dc.GetRole() | ||
| // new task | ||
| subname := fmt.Sprintf("host=%s role=%s containerId=%s", | ||
| dc.GetHost(), dc.GetRole(), tui.TrimContainerId(containerId)) | ||
| t := task.NewTask("Enable Etcd Auth", subname, hc.GetSSHConfig()) | ||
|
|
||
| script := scripts.ENABLE_ETCD_AUTH | ||
| layout := dc.GetProjectLayout() | ||
| scriptPath := fmt.Sprintf("%s/enable_auth.sh", layout.ServiceBinDir) | ||
|
|
||
| etcdEndPoints, err := dc.GetVariables().Get("cluster_etcd_addr") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| t.AddStep(&step.ListContainers{ | ||
| ShowAll: true, | ||
| Format: `"{{.ID}}"`, | ||
| Filter: fmt.Sprintf("id=%s", containerId), | ||
| Out: &out, | ||
| ExecOptions: curveadm.ExecOptions(), | ||
| }) | ||
| t.AddStep(&step.Lambda{ | ||
| Lambda: CheckContainerExist(host, role, containerId, &out), | ||
| }) | ||
| t.AddStep(&step.InstallFile{ // install /curvebs(fs)/etcd/sbin/enable_auth.sh | ||
| ContainerId: &containerId, | ||
| ContainerDestPath: scriptPath, | ||
| Content: &script, | ||
| ExecOptions: curveadm.ExecOptions(), | ||
| }) | ||
| command := fmt.Sprintf("/bin/bash %s %s %s %s", scriptPath, etcdEndPoints, dc.GetEtcdAuthUsername(), | ||
| dc.GetEtcdAuthPassword()) | ||
| t.AddStep(&step.ContainerExec{ | ||
| ContainerId: &containerId, | ||
| Success: &success, | ||
| Out: &out, | ||
| Command: command, | ||
| ExecOptions: curveadm.ExecOptions(), | ||
| }) | ||
| t.AddStep(&step.Lambda{ | ||
| Lambda: checkEnableEtcdAuthStatus(&success, &out), | ||
| }) | ||
| return t, nil | ||
| } |