add alert

Author: bibaijin

README.md

@@ -10,6 +10,19 @@
 ## Licensing
 Entry is released under [MIT](https://github.com/laincloud/entry/blob/master/LICENSE) license.
 
+## 部署
+
+### 配置
+
+请参考 [example.json](example.json) 编写配置文件，并上传到 lvault：
+
+```
+lain secret add ${LAIN-Domain} web /lain/app/prod.json -f example.json
+```
+
+> - `smtp.address` 需要包含端口，如：${mail-address}:25
+> - `smtp.password` 可选，为空时不使用 auth
+
 ## 审计
 
 ## 开发
@@ -20,3 +33,7 @@ Entry is released under [MIT](https://github.com/laincloud/entry/blob/master/LIC
 go get -u github.com/go-swagger/go-swagger/cmd/swagger  # 安装 swagger
 swagger generate server -f ./swagger.yml -t server/gen  # 生成代码
 ```
+
+- `server/gen` 下除 `server/gen/restapi/configure_entry.go` 外均由 `go-swagger` 生成，请不要手动修改
+- `server/gen/restapi/configure_entry.go` 包含初始化逻辑以及后端 API 配置
+- `server/handler` 包含后端 API 的实际逻辑

TODOs.org

@@ -9,6 +9,10 @@
   CLOSED: [2018-03-08 Thu 19:14]
 * DONE 前端：commands content
   CLOSED: [2018-03-09 Fri 20:16]
-* TODO 前端：sessions -> commands 跳转
-* TODO 后端：会话记录
-* TODO 前端：会话重放
+* DONE 前端：sessions -> commands 跳转
+  CLOSED: [2018-03-22 Thu 17:48]
+* DONE 后端：会话记录
+  CLOSED: [2018-03-22 Thu 17:48]
+* DONE 前端：会话重放
+  CLOSED: [2018-03-22 Thu 17:48]
+* TODO 后端：监控报警

frontend/src/MyAxios.jsx

@@ -2,7 +2,7 @@ import axios from 'axios';
 
 const myAxios = axios.create({
   headers: {
-    'Accept': 'application/vnd.laincloud.entry.v1+json'
+    'Accept': 'application/vnd.laincloud.entry.v3+json'
   }
 });
 

lain.yaml

@@ -3,27 +3,28 @@ appname: entry
 build:
     base: golang:1.10
     prepare:
-        version: 20180207
+        version: 20180309
         script:
             # - sed -i 's|deb.debian.org|mirrors.tuna.tsinghua.edu.cn|g' /etc/apt/sources.list
             # - sed -i 's|security.debian.org|mirrors.tuna.tsinghua.edu.cn/debian-security|g' /etc/apt/sources.list
-            # - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
-            # - echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-            # - apt-get -y update && apt-get -y install golang-glide
-            # - apt-get -y update && apt-get -y install yarn
+            - curl -sL https://deb.nodesource.com/setup_9.x | bash -
+            - apt-get -y update && apt-get -y install apt-transport-https ca-certificates golang-glide nodejs
+            - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+            - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+            - apt-get -y update && apt-get -y install yarn
             - mkdir -p $GOPATH/src/github.com/laincloud/entry
             - cp -rf . $GOPATH/src/github.com/laincloud/entry
-            # - cd $GOPATH/src/github.com/laincloud/entry && glide install
+            - cd $GOPATH/src/github.com/laincloud/entry && glide install
             - go install github.com/laincloud/entry/server/gen/cmd/entry-server
-            # - cd $GOPATH/src/github.com/laincloud/entry/frontend/ && yarn install
+            - cd $GOPATH/src/github.com/laincloud/entry/frontend/ && yarn install
     script:
         - cp -rf . $GOPATH/src/github.com/laincloud/entry
         - go install github.com/laincloud/entry/server/gen/cmd/entry-server
-        # - cd $GOPATH/src/github.com/laincloud/entry/frontend/ && yarn build
+        - cd $GOPATH/src/github.com/laincloud/entry/frontend/ && yarn build
 
 test:
     script:
-        - go test github.com/laincloud/entry/server
+        - go test github.com/laincloud/entry/server/...
 
 release:
     dest_base: laincloud/nginx:1.13
@@ -32,7 +33,7 @@ release:
           dest: /lain/app/entry-server
         - src: nginx.conf
           dest: /etc/nginx/conf.d/default.conf
-        - src: frontend/build
+        - src: $GOPATH/src/github.com/laincloud/entry/frontend/build
           dest: /usr/share/nginx/html
 
 web:  # backend
@@ -46,7 +47,7 @@ web:  # backend
     secret_files:
         - /lain/app/prod.json
     cloud_volumes:
-        type: multi
+        type: single
         dirs:
             - /cloud
 

server/config/config.go

@@ -12,6 +12,7 @@ import (
 type Config struct {
 	MySQL MySQL `json:"mysql"`
 	SSO   SSO   `json:"sso"`
+	SMTP  SMTP  `json:"smtp"`
 }
 
 // NewConfig return an initialized configuration
@@ -65,3 +66,10 @@ type SSO struct {
 	EntryGroup   string `json:"entry_group"`
 	Scope        string `json:"scope"`
 }
+
+// SMTP denotes SMTP configuration
+type SMTP struct {
+	Address   string `json:"address"`
+	FromEmail string `json:"from_email"`
+	Password  string `json:"password"`
+}

server/gen/restapi/configure_entry.go

@@ -106,9 +106,6 @@ func configureAPI(api *operations.EntryAPI) http.Handler {
 	api.AuthLogoutHandler = auth.LogoutHandlerFunc(func(params auth.LogoutParams) middleware.Responder {
 		return handler.Logout(params, g)
 	})
-	api.AuthGetMeHandler = auth.GetMeHandlerFunc(func(params auth.GetMeParams) middleware.Responder {
-		return handler.GetMe(params, g)
-	})
 	api.ConfigGetConfigHandler = swaggerconfig.GetConfigHandlerFunc(func(params swaggerconfig.GetConfigParams) middleware.Responder {
 		return handler.GetConfig(params, g)
 	})

server/gen/restapi/doc.go

@@ -62,6 +62,15 @@ func Enter(ctx context.Context, conn *websocket.Conn, r *http.Request, g *global
 	}
 	defer timingFile.Close()
 
+	replay := &sessionReplay{
+		typescriptFile: typescriptFile,
+		timingFile:     timingFile,
+	}
+	pipe := &pipe{
+		requestBuffer:  make(chan []byte),
+		responseBuffer: make(chan []byte),
+	}
+
 	termType := r.Header.Get("term-type")
 	if len(termType) == 0 {
 		termType = "xterm-256color"
@@ -95,9 +104,9 @@ func Enter(ctx context.Context, conn *websocket.Conn, r *http.Request, g *global
 	wg := &sync.WaitGroup{}
 	wg.Add(3)
 	go handleAliveDetection(conn, stopSignal, msgMarshaller, writeLock)
-	go handleRequest(conn, s, stdinPipeWriter, wg, exec.ID, msgUnmarshaller, g)
-	go handleResponse(conn, stdoutPipeReader, wg, message.ResponseMessage_STDOUT, msgMarshaller, writeLock, typescriptFile, timingFile)
-	go handleResponse(conn, stderrPipeReader, wg, message.ResponseMessage_STDERR, msgMarshaller, writeLock, typescriptFile, timingFile)
+	go handleRequest(conn, s, stdinPipeWriter, wg, exec.ID, msgUnmarshaller, g, pipe)
+	go handleResponse(conn, stdoutPipeReader, wg, message.ResponseMessage_STDOUT, msgMarshaller, writeLock, replay, pipe)
+	go handleResponse(conn, stderrPipeReader, wg, message.ResponseMessage_STDERR, msgMarshaller, writeLock, replay, pipe)
 	go func() {
 		if err = g.DockerClient.StartExec(exec.ID, docker.StartExecOptions{
 			Detach:       false,