Skip to content

K
koko
Unverified Commit a5d4a0a1 authored by 老广's avatar 老广 Committed by GitHub
Browse files
Options

Merge pull request #87 from jumpserver/dev 

Dev
parents c16b817f eeb30a18
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 23 deletions
Dockerfile
View file @ a5d4a0a1
FROM golang:1.12-alpine as stage-build FROM golang:1.12-alpine as stage-build
LABEL stage=stage-build LABEL stage=stage-build
WORKDIR /opt/coco WORKDIR /opt/koko
ARG GOPROXY ARG GOPROXY
ENV GOPROXY=$GOPROXY ENV GOPROXY=$GOPROXY
ENV GO111MODULE=on ENV GO111MODULE=on
...@@ -13,11 +13,11 @@ COPY . . ...@@ -13,11 +13,11 @@ COPY . .
RUN cd cmd && go build koko.go RUN cd cmd && go build koko.go
FROM alpine FROM alpine
WORKDIR /opt/coco/ WORKDIR /opt/koko/
COPY --from=stage-build /opt/coco/cmd/koko . COPY --from=stage-build /opt/koko/cmd/koko .
COPY --from=stage-build /opt/coco/cmd/locale/ locale COPY --from=stage-build /opt/koko/cmd/locale/ locale
COPY --from=stage-build /opt/coco/cmd/static/ static COPY --from=stage-build /opt/koko/cmd/static/ static
COPY --from=stage-build /opt/coco/cmd/templates/ templates COPY --from=stage-build /opt/koko/cmd/templates/ templates
COPY cmd/config_example.yml . COPY cmd/config_example.yml .
COPY entrypoint.sh . COPY entrypoint.sh .
RUN chmod 755 ./entrypoint.sh \ RUN chmod 755 ./entrypoint.sh \
......
cmd/templates/elfinder/file_manager.html
View file @ a5d4a0a1
<html> <html>
<body style="margin: 0"> <body style="margin: 0">
<script type="text/javascript" src="/coco/static/js/jquery-3.3.1.js"></script> <script type="text/javascript" src="/koko/static/js/jquery-3.3.1.js"></script>
<script type="text/javascript" src="/coco/static/js/jquery-ui-1.12.1.js"></script> <script type="text/javascript" src="/koko/static/js/jquery-ui-1.12.1.js"></script>
<script type="text/javascript" src="/coco/static/js/neffos.min.js"></script> <script type="text/javascript" src="/koko/static/js/neffos.min.js"></script>
<script type="text/javascript" src="/coco/static/plugins/elfinder/elfinder.full.js"></script> <script type="text/javascript" src="/koko/static/plugins/elfinder/elfinder.full.js"></script>
<script type="text/javascript" src="/coco/static/plugins/elfinder/i18n/elfinder.pl.js"></script> <script type="text/javascript" src="/koko/static/plugins/elfinder/i18n/elfinder.pl.js"></script>
<link rel="stylesheet" type="text/css" media="screen" href="/coco/static/js/jquery-ui-1.12.1.min.css"> <link rel="stylesheet" type="text/css" media="screen" href="/koko/static/js/jquery-ui-1.12.1.min.css">
<link rel="stylesheet" type="text/css" media="screen" href="/coco/static/plugins/elfinder/css/elfinder.full.css"> <link rel="stylesheet" type="text/css" media="screen" href="/koko/static/plugins/elfinder/css/elfinder.full.css">
<link rel="stylesheet" type="text/css" media="screen" href="/coco/static/plugins/elfinder/css/theme-gray.css"> <link rel="stylesheet" type="text/css" media="screen" href="/koko/static/plugins/elfinder/css/theme-gray.css">
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
var scheme = document.location.protocol == "https:" ? "wss" : "ws"; var scheme = document.location.protocol == "https:" ? "wss" : "ws";
var port = document.location.port ? ":" + document.location.port : ""; var port = document.location.port ? ":" + document.location.port : "";
var wsURL = scheme + "://" + document.location.hostname + port + "/socket.io/"; var wsURL = scheme + "://" + document.location.hostname + port + "/koko/ws/";
let interval; let interval;
dial(wsURL, { dial(wsURL, {
"elfinder": { "elfinder": {
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
}, },
customData: {'sid': sid}, customData: {'sid': sid},
width: '100%', width: '100%',
url: '/coco/elfinder/sftp/connector/{{.}}/', url: '/koko/elfinder/sftp/connector/{{.}}/',
resizable: false, resizable: false,
lang: 'pl', lang: 'pl',
requestType: 'get', requestType: 'get',
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
} }
if (lng !== 'en') { if (lng !== 'en') {
$.ajax({ $.ajax({
url : '/coco/static/plugins/elfinder/i18n'+'/elfinder.'+lng+'.js', url : '/koko/static/plugins/elfinder/i18n'+'/elfinder.'+lng+'.js',
cache : true, cache : true,
dataType : 'script' dataType : 'script'
}) })
......
pkg/httpd/server.go
View file @ a5d4a0a1
...@@ -86,13 +86,25 @@ func StartHTTPServer() { ...@@ -86,13 +86,25 @@ func StartHTTPServer() {
router := mux.NewRouter() router := mux.NewRouter()
fs := http.FileServer(http.Dir(filepath.Join(conf.RootPath, "static"))) fs := http.FileServer(http.Dir(filepath.Join(conf.RootPath, "static")))
router.PathPrefix("/coco/static/").Handler(http.StripPrefix("/coco/static/", fs))
router.Handle("/socket.io/", sshWs) subRouter := router.PathPrefix("/koko/").Subrouter()
router.HandleFunc("/coco/elfinder/sftp/{host}/", AuthDecorator(sftpHostFinder)) subRouter.PathPrefix("/static/").Handler(http.StripPrefix("/koko/static/", fs))
router.HandleFunc("/coco/elfinder/sftp/", AuthDecorator(sftpFinder)) subRouter.Handle("/ws/", sshWs)
router.HandleFunc("/coco/elfinder/sftp/connector/{host}/",
AuthDecorator(sftpHostConnectorView)).Methods("GET", "POST") elfinderRouter := subRouter.PathPrefix("/elfinder/").Subrouter()
elfinderRouter.HandleFunc("/sftp/{host}/", AuthDecorator(sftpHostFinder))
elfinderRouter.HandleFunc("/sftp/", AuthDecorator(sftpFinder))
elfinderRouter.HandleFunc("/sftp/connector/{host}/",
AuthDecorator(sftpHostConnectorView),
).Methods("GET", "POST")
//router.PathPrefix("/coco/static/").Handler(http.StripPrefix("/coco/static/", fs))
//router.Handle("/socket.io/", sshWs)
//router.HandleFunc("/coco/elfinder/sftp/{host}/", AuthDecorator(sftpHostFinder))
//router.HandleFunc("/coco/elfinder/sftp/", AuthDecorator(sftpFinder))
//router.HandleFunc("/coco/elfinder/sftp/connector/{host}/",
// AuthDecorator(sftpHostConnectorView)).Methods("GET", "POST")
addr := net.JoinHostPort(conf.BindHost, conf.HTTPPort) addr := net.JoinHostPort(conf.BindHost, conf.HTTPPort)
logger.Debug("Start HTTP server at ", addr) logger.Debug("Start HTTP server at ", addr)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment