Deploy the GitHub username change
This commit is contained in:
2
.ci.sh
2
.ci.sh
@@ -3,7 +3,7 @@
|
|||||||
PATH=$PATH:"$(go env GOPATH)/bin"
|
PATH=$PATH:"$(go env GOPATH)/bin"
|
||||||
GO111MODULE=on
|
GO111MODULE=on
|
||||||
ASC_URL=https://keybase.io/nirui/pgp_keys.asc
|
ASC_URL=https://keybase.io/nirui/pgp_keys.asc
|
||||||
VERSION_VARIABLE=github.com/niruix/sshwifty/application.version
|
VERSION_VARIABLE=github.com/nirui/sshwifty/application.version
|
||||||
BUILD_TARGETS="darwin/amd64 windows/386 windows/amd64 openbsd/386 openbsd/amd64 openbsd/arm openbsd/arm64 freebsd/386 freebsd/amd64 freebsd/arm freebsd/arm64 linux/386 linux/amd64 linux/arm linux/arm64 linux/riscv64 linux/ppc64 linux/ppc64le linux/mips linux/mipsle linux/mips64 linux/mips64le"
|
BUILD_TARGETS="darwin/amd64 windows/386 windows/amd64 openbsd/386 openbsd/amd64 openbsd/arm openbsd/arm64 freebsd/386 freebsd/amd64 freebsd/arm freebsd/arm64 linux/386 linux/amd64 linux/arm linux/arm64 linux/riscv64 linux/ppc64 linux/ppc64le linux/mips linux/mipsle linux/mips64 linux/mips64le"
|
||||||
|
|
||||||
DOCKER_BUILD_TARGETS="linux/amd64,linux/arm/v7,linux/arm64"
|
DOCKER_BUILD_TARGETS="linux/amd64,linux/arm/v7,linux/arm64"
|
||||||
|
|||||||
2
.github/workflows/workflow.yml
vendored
2
.github/workflows/workflow.yml
vendored
@@ -20,9 +20,9 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
export GITHUB_USER="${{ github.repository_owner }}"
|
export GITHUB_USER="${{ github.repository_owner }}"
|
||||||
export GITHUB_USER_TOKEN="${{ secrets.GITHUB_TOKEN }}"
|
export GITHUB_USER_TOKEN="${{ secrets.GITHUB_TOKEN }}"
|
||||||
|
export DOCKER_HUB_USER="${{ secrets.DOCKER_HUB_USERNAME }}"
|
||||||
export DOCKER_HUB_PASSWORD="${{ secrets.DOCKER_HUB_PASSWORD }}"
|
export DOCKER_HUB_PASSWORD="${{ secrets.DOCKER_HUB_PASSWORD }}"
|
||||||
export COVERALLS_TOKEN="${{ secrets.COVERALLS_TOKEN }}"
|
export COVERALLS_TOKEN="${{ secrets.COVERALLS_TOKEN }}"
|
||||||
export DOCKER_HUB_USER="${{ github.repository_owner }}"
|
|
||||||
|
|
||||||
export DOCKER_CUSTOM_COMMAND='echo "GitHub Action Build"'
|
export DOCKER_CUSTOM_COMMAND='echo "GitHub Action Build"'
|
||||||
|
|
||||||
|
|||||||
91
.travis.yml
91
.travis.yml
@@ -1,91 +0,0 @@
|
|||||||
language: go
|
|
||||||
|
|
||||||
sudo: false
|
|
||||||
|
|
||||||
env:
|
|
||||||
global:
|
|
||||||
- GO111MODULE=on
|
|
||||||
- ASC_URL=https://keybase.io/nirui/pgp_keys.asc
|
|
||||||
- PACKAGE=github.com/niruix/sshwifty
|
|
||||||
- VERSION_VARIABLE=github.com/niruix/sshwifty/application.version
|
|
||||||
- BUILD_TARGETS="darwin/amd64 windows/386 windows/amd64 openbsd/386 openbsd/amd64 openbsd/arm openbsd/arm64 freebsd/386 freebsd/amd64 freebsd/arm freebsd/arm64 linux/386 linux/amd64 linux/arm linux/arm64 linux/ppc64 linux/ppc64le linux/mips linux/mipsle linux/mips64 linux/mips64le"
|
|
||||||
- SSHWIFTY_VERSION=$(git describe --always --dirty='*' --tag)
|
|
||||||
- SSHWIFTY_COMMIT=$(git describe --always)
|
|
||||||
- SSHWIFTY_RELEASE=$([[ "$SSHWIFTY_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+\-[a-zA-Z0-9]+\-release$ ]] && echo "yes")
|
|
||||||
- SSHWIFTY_DEPLOY=$([[ "$SSHWIFTY_RELEASE" != "yes" || "$TRAVIS_TAG" == "" || "$GITHUB_USER" == "" || "$GITHUB_TOKEN" == "" ]] || echo "yes")
|
|
||||||
- SSHWIFTY_TEST_COVER=$([[ "$COVERALLS_TOKEN" == "" ]] || echo "yes")
|
|
||||||
|
|
||||||
branches:
|
|
||||||
only:
|
|
||||||
- master
|
|
||||||
- dev
|
|
||||||
- /^[0-9]+\.[0-9]+\.[0-9]+\-[a-zA-Z0-9]+\-release$/
|
|
||||||
|
|
||||||
go:
|
|
||||||
- stable
|
|
||||||
|
|
||||||
before_install:
|
|
||||||
- export
|
|
||||||
- nvm install node --latest-npm && nvm use node
|
|
||||||
- npm install && npm run generate
|
|
||||||
- |
|
|
||||||
if [[ "$SSHWIFTY_TEST_COVER" == "yes" ]]; then
|
|
||||||
go get github.com/go-playground/overalls
|
|
||||||
go get github.com/mattn/goveralls
|
|
||||||
fi
|
|
||||||
- |
|
|
||||||
if [[ "$SSHWIFTY_DEPLOY" == "yes" ]]; then
|
|
||||||
go get github.com/tcnksm/ghr
|
|
||||||
go get github.com/mitchellh/gox
|
|
||||||
fi
|
|
||||||
|
|
||||||
script:
|
|
||||||
- go vet ./...
|
|
||||||
- npm run testonly
|
|
||||||
|
|
||||||
after_success:
|
|
||||||
- |
|
|
||||||
if [[ "$SSHWIFTY_TEST_COVER" == "yes" ]]; then
|
|
||||||
overalls -project="$PACKAGE" -covermode=count
|
|
||||||
goveralls -coverprofile=./overalls.coverprofile -service travis-ci
|
|
||||||
fi
|
|
||||||
|
|
||||||
before_deploy:
|
|
||||||
- |
|
|
||||||
if [[ "$SSHWIFTY_DEPLOY" == "yes" ]]; then
|
|
||||||
mkdir -p ./.tmp/deploy
|
|
||||||
curl "$ASC_URL" > ./.tmp/deploy/GPG.asc
|
|
||||||
cat ./.tmp/deploy/GPG.asc | gpg --import
|
|
||||||
CGO_ENABLED=0 gox -ldflags "-s -w -X $VERSION_VARIABLE=$SSHWIFTY_VERSION" -osarch "$BUILD_TARGETS" -output "./.tmp/deploy/{{.Dir}}_$(echo $SSHWIFTY_VERSION)_{{.OS}}_{{.Arch}}/{{.Dir}}_{{.OS}}_{{.Arch}}"
|
|
||||||
git archive --format tar --output "./.tmp/deploy/src" HEAD
|
|
||||||
echo "# Version $SSHWIFTY_VERSION" > ./.tmp/deploy/Note
|
|
||||||
echo >> ./.tmp/deploy/Note
|
|
||||||
echo "Following updates is included since the last release $(git describe --abbrev=0 --tags $(git rev-list --tags --skip=1 --max-count=1))" >> ./.tmp/deploy/Note
|
|
||||||
git log $(git describe --abbrev=0 --tags $(git rev-list --tags --skip=1 --max-count=1))..HEAD --pretty=format:"- %h %s - (%an) %GK %G?" >> ./.tmp/deploy/Note
|
|
||||||
echo 'echo Preparing for $1 ...;' > prepare.sh
|
|
||||||
echo '(cd $1/ && find . -maxdepth 1 -type f ! -name "SUM.*" -exec sha512sum {} \; > SUM.sha512);' >> prepare.sh
|
|
||||||
echo '(cp *.md $1/);' >> prepare.sh
|
|
||||||
echo '(cp ./.tmp/deploy/GPG.asc $1/);' >> prepare.sh
|
|
||||||
echo '(cp ./.tmp/deploy/Note $1/);' >> prepare.sh
|
|
||||||
echo '(cp ./sshwifty.conf.example.json $1/);' >> prepare.sh
|
|
||||||
echo '(cp "./.tmp/deploy/src" $1/);' >> prepare.sh
|
|
||||||
echo '(cd $1/ && tar zpcvf "../$(basename $(pwd)).tar.gz" * --owner=0 --group=0);' >> prepare.sh
|
|
||||||
chmod +x ./prepare.sh
|
|
||||||
find ./.tmp/deploy/ -maxdepth 1 -type d ! -name "deploy" -exec ./prepare.sh {} \;
|
|
||||||
rm ./prepare.sh -f
|
|
||||||
find ./.tmp/deploy/ -maxdepth 1 -type d ! -name "deploy" -exec rm {} -rf \;
|
|
||||||
find ./.tmp/deploy/ -maxdepth 1 -type f -name "*.tar.gz" -execdir sha512sum {} \; > ./.tmp/deploy/SUM.sha512
|
|
||||||
echo "$GITHUB_USER" > ./deploy_user
|
|
||||||
echo "$SSHWIFTY_VERSION-prebuild" > ./deploy_title
|
|
||||||
echo 'ghr -u "$(cat ./deploy_user)" -n "$(cat ./deploy_title)" -b "$(cat ./.tmp/deploy/Note)" -delete -prerelease "$(cat ./deploy_title)" ./.tmp/deploy' > ./deploy.sh
|
|
||||||
chmod +x ./deploy.sh
|
|
||||||
cat ./.tmp/deploy/SUM.sha512
|
|
||||||
fi
|
|
||||||
|
|
||||||
deploy:
|
|
||||||
provider: script
|
|
||||||
script: ./deploy.sh
|
|
||||||
skip_cleanup: true
|
|
||||||
on:
|
|
||||||
all_branches: true
|
|
||||||
condition: $SSHWIFTY_DEPLOY = yes
|
|
||||||
@@ -6,7 +6,7 @@ compatible (standard) web browser.
|
|||||||
|
|
||||||

|

|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
## Install
|
## Install
|
||||||
|
|
||||||
@@ -18,7 +18,7 @@ Please be advised that those binaries is generated by an automatic proccess,
|
|||||||
the author of this project will NOT verify them. You have to try it at your owk
|
the author of this project will NOT verify them. You have to try it at your owk
|
||||||
risk.
|
risk.
|
||||||
|
|
||||||
[release]: https://github.com/niruix/sshwifty/releases
|
[release]: https://github.com/nirui/sshwifty/releases
|
||||||
|
|
||||||
### Docker Image
|
### Docker Image
|
||||||
|
|
||||||
@@ -66,7 +66,7 @@ Following tools is required in order to build the software from source code:
|
|||||||
To start the build process, execute:
|
To start the build process, execute:
|
||||||
|
|
||||||
```
|
```
|
||||||
$ git clone https://github.com/niruix/sshwifty
|
$ git clone https://github.com/nirui/sshwifty
|
||||||
$ cd sshwifty
|
$ cd sshwifty
|
||||||
$ npm install
|
$ npm install
|
||||||
$ npm run build
|
$ npm run build
|
||||||
|
|||||||
@@ -26,10 +26,10 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/command"
|
"github.com/nirui/sshwifty/application/command"
|
||||||
"github.com/niruix/sshwifty/application/configuration"
|
"github.com/nirui/sshwifty/application/configuration"
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
"github.com/niruix/sshwifty/application/server"
|
"github.com/nirui/sshwifty/application/server"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ProccessSignaller send signal to the running application
|
// ProccessSignaller send signal to the running application
|
||||||
|
|||||||
@@ -22,9 +22,9 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
"github.com/niruix/sshwifty/application/network"
|
"github.com/nirui/sshwifty/application/network"
|
||||||
"github.com/niruix/sshwifty/application/rw"
|
"github.com/nirui/sshwifty/application/rw"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Configuration contains configuration data needed to run command
|
// Configuration contains configuration data needed to run command
|
||||||
|
|||||||
@@ -21,8 +21,8 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/configuration"
|
"github.com/nirui/sshwifty/application/configuration"
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Consts
|
// Consts
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ package command
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/rw"
|
"github.com/nirui/sshwifty/application/rw"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Errors
|
// Errors
|
||||||
|
|||||||
@@ -24,8 +24,8 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
"github.com/niruix/sshwifty/application/rw"
|
"github.com/nirui/sshwifty/application/rw"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Errors
|
// Errors
|
||||||
|
|||||||
@@ -23,8 +23,8 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
"github.com/niruix/sshwifty/application/rw"
|
"github.com/nirui/sshwifty/application/rw"
|
||||||
)
|
)
|
||||||
|
|
||||||
func testDummyFetchGen(data []byte) rw.FetchReaderFetcher {
|
func testDummyFetchGen(data []byte) rw.FetchReaderFetcher {
|
||||||
|
|||||||
@@ -24,8 +24,8 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
"github.com/niruix/sshwifty/application/rw"
|
"github.com/nirui/sshwifty/application/rw"
|
||||||
)
|
)
|
||||||
|
|
||||||
func testDummyFetchChainGen(dd <-chan []byte) rw.FetchReaderFetcher {
|
func testDummyFetchChainGen(dd <-chan []byte) rw.FetchReaderFetcher {
|
||||||
|
|||||||
@@ -21,8 +21,8 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"io"
|
"io"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
"github.com/niruix/sshwifty/application/rw"
|
"github.com/nirui/sshwifty/application/rw"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Errors
|
// Errors
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import (
|
|||||||
"net"
|
"net"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/rw"
|
"github.com/nirui/sshwifty/application/rw"
|
||||||
)
|
)
|
||||||
|
|
||||||
//Errors
|
//Errors
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
package commands
|
package commands
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/niruix/sshwifty/application/command"
|
"github.com/nirui/sshwifty/application/command"
|
||||||
)
|
)
|
||||||
|
|
||||||
// New creates a new commands group
|
// New creates a new commands group
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ package commands
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/rw"
|
"github.com/nirui/sshwifty/application/rw"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Errors
|
// Errors
|
||||||
|
|||||||
@@ -26,11 +26,11 @@ import (
|
|||||||
|
|
||||||
"golang.org/x/crypto/ssh"
|
"golang.org/x/crypto/ssh"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/command"
|
"github.com/nirui/sshwifty/application/command"
|
||||||
"github.com/niruix/sshwifty/application/configuration"
|
"github.com/nirui/sshwifty/application/configuration"
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
"github.com/niruix/sshwifty/application/network"
|
"github.com/nirui/sshwifty/application/network"
|
||||||
"github.com/niruix/sshwifty/application/rw"
|
"github.com/nirui/sshwifty/application/rw"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Server -> client signal Consts
|
// Server -> client signal Consts
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ package commands
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/rw"
|
"github.com/nirui/sshwifty/application/rw"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Errors
|
// Errors
|
||||||
|
|||||||
@@ -23,11 +23,11 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/command"
|
"github.com/nirui/sshwifty/application/command"
|
||||||
"github.com/niruix/sshwifty/application/configuration"
|
"github.com/nirui/sshwifty/application/configuration"
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
"github.com/niruix/sshwifty/application/network"
|
"github.com/nirui/sshwifty/application/network"
|
||||||
"github.com/niruix/sshwifty/application/rw"
|
"github.com/nirui/sshwifty/application/rw"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Errors
|
// Errors
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ import (
|
|||||||
"net"
|
"net"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/network"
|
"github.com/nirui/sshwifty/application/network"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Server contains configuration of a HTTP server
|
// Server contains configuration of a HTTP server
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
package configuration
|
package configuration
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
// PresetReloader reloads preset
|
// PresetReloader reloads preset
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
package configuration
|
package configuration
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ package configuration
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Error
|
// Error
|
||||||
|
|||||||
@@ -22,10 +22,10 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/command"
|
"github.com/nirui/sshwifty/application/command"
|
||||||
"github.com/niruix/sshwifty/application/configuration"
|
"github.com/nirui/sshwifty/application/configuration"
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
"github.com/niruix/sshwifty/application/server"
|
"github.com/nirui/sshwifty/application/server"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Errors
|
// Errors
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ package controller
|
|||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
func serveFailure(
|
func serveFailure(
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ package controller
|
|||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
// home controller
|
// home controller
|
||||||
|
|||||||
@@ -33,10 +33,10 @@ import (
|
|||||||
|
|
||||||
"github.com/gorilla/websocket"
|
"github.com/gorilla/websocket"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/command"
|
"github.com/nirui/sshwifty/application/command"
|
||||||
"github.com/niruix/sshwifty/application/configuration"
|
"github.com/nirui/sshwifty/application/configuration"
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
"github.com/niruix/sshwifty/application/rw"
|
"github.com/nirui/sshwifty/application/rw"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Errors
|
// Errors
|
||||||
|
|||||||
@@ -26,8 +26,8 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/configuration"
|
"github.com/nirui/sshwifty/application/configuration"
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
type socketVerification struct {
|
type socketVerification struct {
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
type staticData struct {
|
type staticData struct {
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
parentPackage = "github.com/niruix/sshwifty/application/controller"
|
parentPackage = "github.com/nirui/sshwifty/application/controller"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -199,7 +199,7 @@ var (
|
|||||||
//
|
//
|
||||||
// Copyright (C) {{ .Date.Year }} Rui NI (nirui@gmx.com)
|
// Copyright (C) {{ .Date.Year }} Rui NI (nirui@gmx.com)
|
||||||
//
|
//
|
||||||
// https://github.com/niruix/sshwifty
|
// https://github.com/nirui/sshwifty
|
||||||
//
|
//
|
||||||
// This file is generated at {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 MST" }}
|
// This file is generated at {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 MST" }}
|
||||||
// by "go generate", DO NOT EDIT! Also, do not open this file, it maybe too large
|
// by "go generate", DO NOT EDIT! Also, do not open this file, it maybe too large
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ const (
|
|||||||
Name = "Sshwifty"
|
Name = "Sshwifty"
|
||||||
FullName = "Sshwifty Web SSH Client"
|
FullName = "Sshwifty Web SSH Client"
|
||||||
Author = "Rui NI <nirui@gmx.com>"
|
Author = "Rui NI <nirui@gmx.com>"
|
||||||
URL = "https://github.com/niruix/sshwifty"
|
URL = "https://github.com/nirui/sshwifty"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Banner message
|
// Banner message
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import (
|
|||||||
"net"
|
"net"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/network"
|
"github.com/nirui/sshwifty/application/network"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
|||||||
@@ -27,9 +27,9 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application/command"
|
"github.com/nirui/sshwifty/application/command"
|
||||||
"github.com/niruix/sshwifty/application/configuration"
|
"github.com/nirui/sshwifty/application/configuration"
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
type dumpWrite struct{}
|
type dumpWrite struct{}
|
||||||
|
|||||||
2
go.mod
2
go.mod
@@ -15,7 +15,7 @@
|
|||||||
// You should have received a copy of the GNU Affero General Public License
|
// You should have received a copy of the GNU Affero General Public License
|
||||||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
module github.com/niruix/sshwifty
|
module github.com/nirui/sshwifty
|
||||||
|
|
||||||
go 1.13
|
go 1.13
|
||||||
|
|
||||||
|
|||||||
10
sshwifty.go
10
sshwifty.go
@@ -20,11 +20,11 @@ package main
|
|||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/niruix/sshwifty/application"
|
"github.com/nirui/sshwifty/application"
|
||||||
"github.com/niruix/sshwifty/application/commands"
|
"github.com/nirui/sshwifty/application/commands"
|
||||||
"github.com/niruix/sshwifty/application/configuration"
|
"github.com/nirui/sshwifty/application/configuration"
|
||||||
"github.com/niruix/sshwifty/application/controller"
|
"github.com/nirui/sshwifty/application/controller"
|
||||||
"github.com/niruix/sshwifty/application/log"
|
"github.com/nirui/sshwifty/application/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|||||||
20
ui/auth.vue
20
ui/auth.vue
@@ -28,7 +28,7 @@
|
|||||||
<div
|
<div
|
||||||
class="field"
|
class="field"
|
||||||
:class="{
|
:class="{
|
||||||
error: passphraseErr.length > 0 || error.length > 0
|
error: passphraseErr.length > 0 || error.length > 0,
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
Passphrase
|
Passphrase
|
||||||
@@ -49,7 +49,7 @@
|
|||||||
class="message"
|
class="message"
|
||||||
>
|
>
|
||||||
A valid password is required in order to use this
|
A valid password is required in order to use this
|
||||||
<a href="https://github.com/niruix/sshwifty">Sshwifty</a>
|
<a href="https://github.com/nirui/sshwifty">Sshwifty</a>
|
||||||
instance
|
instance
|
||||||
</div>
|
</div>
|
||||||
<div v-else class="error">
|
<div v-else class="error">
|
||||||
@@ -79,20 +79,20 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
el.focus();
|
el.focus();
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
error: {
|
error: {
|
||||||
type: String,
|
type: String,
|
||||||
default: ""
|
default: "",
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
submitting: false,
|
submitting: false,
|
||||||
passphrase: "",
|
passphrase: "",
|
||||||
passphraseErr: ""
|
passphraseErr: "",
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
@@ -100,7 +100,7 @@ export default {
|
|||||||
if (newVal.length > 0) {
|
if (newVal.length > 0) {
|
||||||
this.submitting = false;
|
this.submitting = false;
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
mounted() {},
|
mounted() {},
|
||||||
methods: {
|
methods: {
|
||||||
@@ -120,7 +120,7 @@ export default {
|
|||||||
this.passphraseErr = "";
|
this.passphraseErr = "";
|
||||||
|
|
||||||
this.$emit("auth", this.passphrase);
|
this.$emit("auth", this.passphrase);
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -45,7 +45,7 @@
|
|||||||
Copyright © 2019-2020 Rui NI <nirui@gmx.com>
|
Copyright © 2019-2020 Rui NI <nirui@gmx.com>
|
||||||
</p>
|
</p>
|
||||||
<p class="copy">
|
<p class="copy">
|
||||||
<a href="https://github.com/niruix/sshwifty" target="blank">
|
<a href="https://github.com/nirui/sshwifty" target="blank">
|
||||||
Source code
|
Source code
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
|||||||
@@ -67,7 +67,7 @@
|
|||||||
<p>
|
<p>
|
||||||
Sshwifty is a free software, you can deploy it on your own trusted
|
Sshwifty is a free software, you can deploy it on your own trusted
|
||||||
infrastructure.
|
infrastructure.
|
||||||
<a href="https://github.com/niruix/sshwifty" target="_blank"
|
<a href="https://github.com/nirui/sshwifty" target="_blank"
|
||||||
>Learn more</a
|
>Learn more</a
|
||||||
>
|
>
|
||||||
</p>
|
</p>
|
||||||
@@ -92,54 +92,54 @@ export default {
|
|||||||
window: Window,
|
window: Window,
|
||||||
"connect-switch": ConnectSwitch,
|
"connect-switch": ConnectSwitch,
|
||||||
"connect-known": ConnectKnown,
|
"connect-known": ConnectKnown,
|
||||||
"connect-new": ConnectNew
|
"connect-new": ConnectNew,
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
display: {
|
display: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false,
|
||||||
},
|
},
|
||||||
inputting: {
|
inputting: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false,
|
||||||
},
|
},
|
||||||
presets: {
|
presets: {
|
||||||
type: Array,
|
type: Array,
|
||||||
default: () => []
|
default: () => [],
|
||||||
},
|
},
|
||||||
restrictedToPresets: {
|
restrictedToPresets: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: () => false
|
default: () => false,
|
||||||
},
|
},
|
||||||
knowns: {
|
knowns: {
|
||||||
type: Array,
|
type: Array,
|
||||||
default: () => []
|
default: () => [],
|
||||||
},
|
},
|
||||||
knownsLauncherBuilder: {
|
knownsLauncherBuilder: {
|
||||||
type: Function,
|
type: Function,
|
||||||
default: () => []
|
default: () => [],
|
||||||
},
|
},
|
||||||
knownsExport: {
|
knownsExport: {
|
||||||
type: Function,
|
type: Function,
|
||||||
default: () => []
|
default: () => [],
|
||||||
},
|
},
|
||||||
knownsImport: {
|
knownsImport: {
|
||||||
type: Function,
|
type: Function,
|
||||||
default: () => []
|
default: () => [],
|
||||||
},
|
},
|
||||||
connectors: {
|
connectors: {
|
||||||
type: Array,
|
type: Array,
|
||||||
default: () => []
|
default: () => [],
|
||||||
},
|
},
|
||||||
busy: {
|
busy: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false,
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
tab: "new",
|
tab: "new",
|
||||||
canSelect: true
|
canSelect: true,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
@@ -184,7 +184,7 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.$emit("known-clear-session", uid);
|
this.$emit("known-clear-session", uid);
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Reference in New Issue
Block a user