mirror of
https://github.com/casdoor/casdoor.git
synced 2025-07-09 09:23:40 +08:00
Compare commits
91 Commits
Author | SHA1 | Date | |
---|---|---|---|
25d56ee8d5 | |||
7e5952c804 | |||
80bf29d79a | |||
971e53dfd8 | |||
654b903d7a | |||
2f72e6971b | |||
d4b587b93e | |||
ac7a510949 | |||
d86f3c88c7 | |||
7c77519069 | |||
2bdf467e3a | |||
52b692c8ad | |||
304643736b | |||
b0f572c51a | |||
19d351d157 | |||
d0751bf2fa | |||
290cc60f00 | |||
6a1ec51978 | |||
dffa68cbce | |||
fad209a7a3 | |||
8b222ce2e3 | |||
c5293f428d | |||
146aec9ee8 | |||
50a52de856 | |||
8f7a8d7d4f | |||
23f3fe1e3c | |||
59ff5e02ab | |||
8d41508d6b | |||
04f70cf012 | |||
83724c73f9 | |||
33e419e133 | |||
b832c304ae | |||
4c7f6fda37 | |||
e4a54fe375 | |||
87da3dad76 | |||
44ad88353f | |||
a955fb57d6 | |||
d2960ad66b | |||
5243aabf43 | |||
d3a2c2a66e | |||
0a9058a585 | |||
225719810b | |||
c634d4a891 | |||
3dc01ec85d | |||
a7324f1da1 | |||
6da452d7e0 | |||
5abcf913e6 | |||
58455e688e | |||
4d6f68eddc | |||
67f3c5a489 | |||
9c48582e0c | |||
645c631db9 | |||
3128e68df4 | |||
2247c6a883 | |||
04709f731b | |||
ebe1887e8b | |||
a7a8805713 | |||
ceabbe27b4 | |||
7393b90155 | |||
0098c05fb3 | |||
34324d9f72 | |||
28b381e01e | |||
40039e0412 | |||
116420adb2 | |||
07c1e3b836 | |||
a447d64bf2 | |||
4116b1d305 | |||
1490044295 | |||
79f2af405a | |||
575a248c41 | |||
7083904634 | |||
3d50255060 | |||
e295da774f | |||
a3cee496b4 | |||
084a5c3e6b | |||
6670450439 | |||
e1331f314d | |||
604033aa02 | |||
729c20393c | |||
a90b27b74a | |||
5707e38912 | |||
ed959bd8c7 | |||
b6cdc46023 | |||
c661a57cb2 | |||
8456b7f7c4 | |||
e8d2906e3c | |||
1edb91b3a3 | |||
94b6eb803d | |||
cfce5289ed | |||
10f1c37730 | |||
6035b98653 |
22
.github/workflows/build.yml
vendored
22
.github/workflows/build.yml
vendored
@ -34,7 +34,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-node@v2
|
- uses: actions/setup-node@v2
|
||||||
with:
|
with:
|
||||||
node-version: '14.17.0'
|
node-version: 16
|
||||||
# cache
|
# cache
|
||||||
- uses: c-hive/gha-yarn-cache@v2
|
- uses: c-hive/gha-yarn-cache@v2
|
||||||
with:
|
with:
|
||||||
@ -89,7 +89,7 @@ jobs:
|
|||||||
- name: Setup Node.js
|
- name: Setup Node.js
|
||||||
uses: actions/setup-node@v2
|
uses: actions/setup-node@v2
|
||||||
with:
|
with:
|
||||||
node-version: 12
|
node-version: 16
|
||||||
|
|
||||||
- name: Fetch Previous version
|
- name: Fetch Previous version
|
||||||
id: get-previous-tag
|
id: get-previous-tag
|
||||||
@ -125,26 +125,36 @@ jobs:
|
|||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
- name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v2
|
||||||
|
|
||||||
|
- name: Set up buildx
|
||||||
|
id: buildx
|
||||||
|
uses: docker/setup-buildx-action@v2
|
||||||
|
with:
|
||||||
|
version: latest
|
||||||
|
|
||||||
- name: Log in to Docker Hub
|
- name: Log in to Docker Hub
|
||||||
uses: docker/login-action@v1
|
uses: docker/login-action@v1
|
||||||
if: github.repository == 'casdoor/casdoor' && github.event_name == 'push' &&steps.should_push.outputs.push=='true'
|
if: github.repository == 'casdoor/casdoor' && github.event_name == 'push' && steps.should_push.outputs.push=='true'
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_PASSWORD }}
|
password: ${{ secrets.DOCKERHUB_PASSWORD }}
|
||||||
|
|
||||||
|
|
||||||
- name: Push to Docker Hub
|
- name: Push to Docker Hub
|
||||||
uses: docker/build-push-action@v2
|
uses: docker/build-push-action@v3
|
||||||
if: github.repository == 'casdoor/casdoor' && github.event_name == 'push' && steps.should_push.outputs.push=='true'
|
if: github.repository == 'casdoor/casdoor' && github.event_name == 'push' && steps.should_push.outputs.push=='true'
|
||||||
with:
|
with:
|
||||||
target: STANDARD
|
target: STANDARD
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
push: true
|
push: true
|
||||||
tags: casbin/casdoor:${{steps.get-current-tag.outputs.tag }},casbin/casdoor:latest
|
tags: casbin/casdoor:${{steps.get-current-tag.outputs.tag }},casbin/casdoor:latest
|
||||||
|
|
||||||
- name: Push All In One Version to Docker Hub
|
- name: Push All In One Version to Docker Hub
|
||||||
uses: docker/build-push-action@v2
|
uses: docker/build-push-action@v3
|
||||||
if: github.repository == 'casdoor/casdoor' && github.event_name == 'push' && steps.should_push.outputs.push=='true'
|
if: github.repository == 'casdoor/casdoor' && github.event_name == 'push' && steps.should_push.outputs.push=='true'
|
||||||
with:
|
with:
|
||||||
target: ALLINONE
|
target: ALLINONE
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
push: true
|
push: true
|
||||||
tags: casbin/casdoor-all-in-one:${{steps.get-current-tag.outputs.tag }},casbin/casdoor-all-in-one:latest
|
tags: casbin/casdoor-all-in-one:${{steps.get-current-tag.outputs.tag }},casbin/casdoor-all-in-one:latest
|
||||||
|
3
.gitignore
vendored
3
.gitignore
vendored
@ -27,3 +27,6 @@ logs/
|
|||||||
files/
|
files/
|
||||||
lastupdate.tmp
|
lastupdate.tmp
|
||||||
commentsRouter*.go
|
commentsRouter*.go
|
||||||
|
|
||||||
|
# ignore build result
|
||||||
|
casdoor
|
28
Dockerfile
28
Dockerfile
@ -2,7 +2,7 @@ FROM node:16.13.0 AS FRONT
|
|||||||
WORKDIR /web
|
WORKDIR /web
|
||||||
COPY ./web .
|
COPY ./web .
|
||||||
RUN yarn config set registry https://registry.npmmirror.com
|
RUN yarn config set registry https://registry.npmmirror.com
|
||||||
RUN yarn install && yarn run build
|
RUN yarn install --frozen-lockfile --network-timeout 1000000 && yarn run build
|
||||||
|
|
||||||
|
|
||||||
FROM golang:1.17.5 AS BACK
|
FROM golang:1.17.5 AS BACK
|
||||||
@ -13,16 +13,29 @@ RUN ./build.sh
|
|||||||
|
|
||||||
FROM alpine:latest AS STANDARD
|
FROM alpine:latest AS STANDARD
|
||||||
LABEL MAINTAINER="https://casdoor.org/"
|
LABEL MAINTAINER="https://casdoor.org/"
|
||||||
|
ARG USER=casdoor
|
||||||
|
ARG TARGETOS
|
||||||
|
ARG TARGETARCH
|
||||||
|
ENV BUILDX_ARCH="${TARGETOS:-linux}_${TARGETARCH:-amd64}"
|
||||||
|
|
||||||
RUN sed -i 's/https/http/' /etc/apk/repositories
|
RUN sed -i 's/https/http/' /etc/apk/repositories
|
||||||
|
RUN apk add --update sudo
|
||||||
RUN apk add curl
|
RUN apk add curl
|
||||||
RUN apk add ca-certificates && update-ca-certificates
|
RUN apk add ca-certificates && update-ca-certificates
|
||||||
|
|
||||||
|
RUN adduser -D $USER -u 1000 \
|
||||||
|
&& echo "$USER ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$USER \
|
||||||
|
&& chmod 0440 /etc/sudoers.d/$USER \
|
||||||
|
&& mkdir logs \
|
||||||
|
&& chown -R $USER:$USER logs
|
||||||
|
|
||||||
|
USER 1000
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
COPY --from=BACK /go/src/casdoor/server ./server
|
COPY --from=BACK --chown=$USER:$USER /go/src/casdoor/server_${BUILDX_ARCH} ./server
|
||||||
COPY --from=BACK /go/src/casdoor/swagger ./swagger
|
COPY --from=BACK --chown=$USER:$USER /go/src/casdoor/swagger ./swagger
|
||||||
COPY --from=BACK /go/src/casdoor/conf/app.conf ./conf/app.conf
|
COPY --from=BACK --chown=$USER:$USER /go/src/casdoor/conf/app.conf ./conf/app.conf
|
||||||
COPY --from=FRONT /web/build ./web/build
|
COPY --from=FRONT --chown=$USER:$USER /web/build ./web/build
|
||||||
|
|
||||||
ENTRYPOINT ["/server"]
|
ENTRYPOINT ["/server"]
|
||||||
|
|
||||||
|
|
||||||
@ -36,12 +49,15 @@ RUN apt update \
|
|||||||
|
|
||||||
FROM db AS ALLINONE
|
FROM db AS ALLINONE
|
||||||
LABEL MAINTAINER="https://casdoor.org/"
|
LABEL MAINTAINER="https://casdoor.org/"
|
||||||
|
ARG TARGETOS
|
||||||
|
ARG TARGETARCH
|
||||||
|
ENV BUILDX_ARCH="${TARGETOS:-linux}_${TARGETARCH:-amd64}"
|
||||||
|
|
||||||
RUN apt update
|
RUN apt update
|
||||||
RUN apt install -y ca-certificates && update-ca-certificates
|
RUN apt install -y ca-certificates && update-ca-certificates
|
||||||
|
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
COPY --from=BACK /go/src/casdoor/server ./server
|
COPY --from=BACK /go/src/casdoor/server_${BUILDX_ARCH} ./server
|
||||||
COPY --from=BACK /go/src/casdoor/swagger ./swagger
|
COPY --from=BACK /go/src/casdoor/swagger ./swagger
|
||||||
COPY --from=BACK /go/src/casdoor/docker-entrypoint.sh /docker-entrypoint.sh
|
COPY --from=BACK /go/src/casdoor/docker-entrypoint.sh /docker-entrypoint.sh
|
||||||
COPY --from=BACK /go/src/casdoor/conf/app.conf ./conf/app.conf
|
COPY --from=BACK /go/src/casdoor/conf/app.conf ./conf/app.conf
|
||||||
|
@ -51,7 +51,7 @@
|
|||||||
## Documentation
|
## Documentation
|
||||||
|
|
||||||
- International: https://casdoor.org
|
- International: https://casdoor.org
|
||||||
- Asian mirror: https://docs.casdoor.cn
|
- Asian mirror: https://casdoor.cn
|
||||||
|
|
||||||
## Install
|
## Install
|
||||||
|
|
||||||
@ -69,7 +69,7 @@ https://casdoor.org/docs/how-to-connect/overview
|
|||||||
|
|
||||||
## Integrations
|
## Integrations
|
||||||
|
|
||||||
https://casdoor.org/docs/integration/apisix
|
https://casdoor.org/docs/category/integrations
|
||||||
|
|
||||||
## How to contact?
|
## How to contact?
|
||||||
|
|
||||||
|
9
SECURITY.md
Normal file
9
SECURITY.md
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
# Security Policy
|
||||||
|
|
||||||
|
## Reporting a Vulnerability
|
||||||
|
|
||||||
|
We are grateful for security researchers and users reporting a vulnerability to us first. To ensure that your request is handled in a timely manner and we can keep users safe, please follow the below guidelines.
|
||||||
|
|
||||||
|
- **Please do not report security vulnerabilities directly on GitHub.**
|
||||||
|
|
||||||
|
- To report a vulnerability, please email [admin@casdoor.org](admin@casdoor.org).
|
@ -15,10 +15,14 @@
|
|||||||
package authz
|
package authz
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/casbin/casbin/v2"
|
"github.com/casbin/casbin/v2"
|
||||||
"github.com/casbin/casbin/v2/model"
|
"github.com/casbin/casbin/v2/model"
|
||||||
xormadapter "github.com/casbin/xorm-adapter/v2"
|
xormadapter "github.com/casbin/xorm-adapter/v3"
|
||||||
"github.com/casdoor/casdoor/conf"
|
"github.com/casdoor/casdoor/conf"
|
||||||
|
"github.com/casdoor/casdoor/object"
|
||||||
stringadapter "github.com/qiangmzsx/string-adapter/v2"
|
stringadapter "github.com/qiangmzsx/string-adapter/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -28,7 +32,7 @@ func InitAuthz() {
|
|||||||
var err error
|
var err error
|
||||||
|
|
||||||
tableNamePrefix := conf.GetConfigString("tableNamePrefix")
|
tableNamePrefix := conf.GetConfigString("tableNamePrefix")
|
||||||
a, err := xormadapter.NewAdapterWithTableName(conf.GetConfigString("driverName"), conf.GetBeegoConfDataSourceName()+conf.GetConfigString("dbName"), "casbin_rule", tableNamePrefix, true)
|
a, err := xormadapter.NewAdapterWithTableName(conf.GetConfigString("driverName"), conf.GetConfigDataSourceName()+conf.GetConfigString("dbName"), "casbin_rule", tableNamePrefix, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
@ -87,6 +91,7 @@ p, *, *, GET, /api/get-organization-applications, *, *
|
|||||||
p, *, *, GET, /api/get-user, *, *
|
p, *, *, GET, /api/get-user, *, *
|
||||||
p, *, *, GET, /api/get-user-application, *, *
|
p, *, *, GET, /api/get-user-application, *, *
|
||||||
p, *, *, GET, /api/get-resources, *, *
|
p, *, *, GET, /api/get-resources, *, *
|
||||||
|
p, *, *, GET, /api/get-records, *, *
|
||||||
p, *, *, GET, /api/get-product, *, *
|
p, *, *, GET, /api/get-product, *, *
|
||||||
p, *, *, POST, /api/buy-product, *, *
|
p, *, *, POST, /api/buy-product, *, *
|
||||||
p, *, *, GET, /api/get-payment, *, *
|
p, *, *, GET, /api/get-payment, *, *
|
||||||
@ -108,6 +113,7 @@ p, *, *, GET, /api/saml/metadata, *, *
|
|||||||
p, *, *, *, /cas, *, *
|
p, *, *, *, /cas, *, *
|
||||||
p, *, *, *, /api/webauthn, *, *
|
p, *, *, *, /api/webauthn, *, *
|
||||||
p, *, *, GET, /api/get-release, *, *
|
p, *, *, GET, /api/get-release, *, *
|
||||||
|
p, *, *, GET, /api/get-default-application, *, *
|
||||||
`
|
`
|
||||||
|
|
||||||
sa := stringadapter.NewAdapter(ruleText)
|
sa := stringadapter.NewAdapter(ruleText)
|
||||||
@ -134,6 +140,12 @@ func IsAllowed(subOwner string, subName string, method string, urlPath string, o
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
userId := fmt.Sprintf("%s/%s", subOwner, subName)
|
||||||
|
user := object.GetUser(userId)
|
||||||
|
if user != nil && user.IsAdmin && subOwner == objOwner {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
res, err := Enforcer.Enforce(subOwner, subName, method, urlPath, objOwner, objName)
|
res, err := Enforcer.Enforce(subOwner, subName, method, urlPath, objOwner, objName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
@ -144,7 +156,7 @@ func IsAllowed(subOwner string, subName string, method string, urlPath string, o
|
|||||||
|
|
||||||
func isAllowedInDemoMode(subOwner string, subName string, method string, urlPath string, objOwner string, objName string) bool {
|
func isAllowedInDemoMode(subOwner string, subName string, method string, urlPath string, objOwner string, objName string) bool {
|
||||||
if method == "POST" {
|
if method == "POST" {
|
||||||
if urlPath == "/api/login" || urlPath == "/api/logout" || urlPath == "/api/signup" || urlPath == "/api/send-verification-code" {
|
if strings.HasPrefix(urlPath, "/api/login") || urlPath == "/api/logout" || urlPath == "/api/signup" || urlPath == "/api/send-verification-code" {
|
||||||
return true
|
return true
|
||||||
} else if urlPath == "/api/update-user" {
|
} else if urlPath == "/api/update-user" {
|
||||||
// Allow ordinary users to update their own information
|
// Allow ordinary users to update their own information
|
||||||
|
5
build.sh
5
build.sh
@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
#try to connect to google to determine whether user need to use proxy
|
#try to connect to google to determine whether user need to use proxy
|
||||||
curl www.google.com -o /dev/null --connect-timeout 5 2 > /dev/null
|
curl www.google.com -o /dev/null --connect-timeout 5 2> /dev/null
|
||||||
if [ $? == 0 ]
|
if [ $? == 0 ]
|
||||||
then
|
then
|
||||||
echo "Successfully connected to Google, no need to use Go proxy"
|
echo "Successfully connected to Google, no need to use Go proxy"
|
||||||
@ -8,4 +8,5 @@ else
|
|||||||
echo "Google is blocked, Go proxy is enabled: GOPROXY=https://goproxy.cn,direct"
|
echo "Google is blocked, Go proxy is enabled: GOPROXY=https://goproxy.cn,direct"
|
||||||
export GOPROXY="https://goproxy.cn,direct"
|
export GOPROXY="https://goproxy.cn,direct"
|
||||||
fi
|
fi
|
||||||
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o server .
|
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o server_linux_amd64 .
|
||||||
|
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="-w -s" -o server_linux_arm64 .
|
||||||
|
@ -14,6 +14,8 @@
|
|||||||
|
|
||||||
package captcha
|
package captcha
|
||||||
|
|
||||||
|
import "fmt"
|
||||||
|
|
||||||
type CaptchaProvider interface {
|
type CaptchaProvider interface {
|
||||||
VerifyCaptcha(token, clientSecret string) (bool, error)
|
VerifyCaptcha(token, clientSecret string) (bool, error)
|
||||||
}
|
}
|
||||||
@ -32,3 +34,12 @@ func GetCaptchaProvider(captchaType string) CaptchaProvider {
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func VerifyCaptchaByCaptchaType(captchaType, token, clientSecret string) (bool, error) {
|
||||||
|
provider := GetCaptchaProvider(captchaType)
|
||||||
|
if provider == nil {
|
||||||
|
return false, fmt.Errorf("invalid captcha provider: %s", captchaType)
|
||||||
|
}
|
||||||
|
|
||||||
|
return provider.VerifyCaptcha(token, clientSecret)
|
||||||
|
}
|
||||||
|
@ -18,3 +18,6 @@ logPostOnly = true
|
|||||||
origin =
|
origin =
|
||||||
staticBaseUrl = "https://cdn.casbin.org"
|
staticBaseUrl = "https://cdn.casbin.org"
|
||||||
isDemoMode = false
|
isDemoMode = false
|
||||||
|
batchSize = 100
|
||||||
|
ldapServerPort = 389
|
||||||
|
languages = en,zh,es,fr,de,ja,ko,ru
|
||||||
|
35
conf/conf.go
35
conf/conf.go
@ -21,9 +21,22 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/astaxie/beego"
|
"github.com/beego/beego"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
// this array contains the beego configuration items that may be modified via env
|
||||||
|
presetConfigItems := []string{"httpport", "appname"}
|
||||||
|
for _, key := range presetConfigItems {
|
||||||
|
if value, ok := os.LookupEnv(key); ok {
|
||||||
|
err := beego.AppConfig.Set(key, value)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func GetConfigString(key string) string {
|
func GetConfigString(key string) string {
|
||||||
if value, ok := os.LookupEnv(key); ok {
|
if value, ok := os.LookupEnv(key); ok {
|
||||||
return value
|
return value
|
||||||
@ -55,17 +68,7 @@ func GetConfigInt64(key string) (int64, error) {
|
|||||||
return num, err
|
return num, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func GetConfigDataSourceName() string {
|
||||||
// this array contains the beego configuration items that may be modified via env
|
|
||||||
presetConfigItems := []string{"httpport", "appname"}
|
|
||||||
for _, key := range presetConfigItems {
|
|
||||||
if value, ok := os.LookupEnv(key); ok {
|
|
||||||
beego.AppConfig.Set(key, value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func GetBeegoConfDataSourceName() string {
|
|
||||||
dataSourceName := GetConfigString("dataSourceName")
|
dataSourceName := GetConfigString("dataSourceName")
|
||||||
|
|
||||||
runningInDocker := os.Getenv("RUNNING_IN_DOCKER")
|
runningInDocker := os.Getenv("RUNNING_IN_DOCKER")
|
||||||
@ -84,3 +87,11 @@ func GetBeegoConfDataSourceName() string {
|
|||||||
func IsDemoMode() bool {
|
func IsDemoMode() bool {
|
||||||
return strings.ToLower(GetConfigString("isDemoMode")) == "true"
|
return strings.ToLower(GetConfigString("isDemoMode")) == "true"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetConfigBatchSize() int {
|
||||||
|
res, err := strconv.Atoi(GetConfigString("batchSize"))
|
||||||
|
if err != nil {
|
||||||
|
res = 100
|
||||||
|
}
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
@ -18,7 +18,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/astaxie/beego"
|
"github.com/beego/beego"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -64,6 +64,10 @@ type RequestForm struct {
|
|||||||
RelayState string `json:"relayState"`
|
RelayState string `json:"relayState"`
|
||||||
SamlRequest string `json:"samlRequest"`
|
SamlRequest string `json:"samlRequest"`
|
||||||
SamlResponse string `json:"samlResponse"`
|
SamlResponse string `json:"samlResponse"`
|
||||||
|
|
||||||
|
CaptchaType string `json:"captchaType"`
|
||||||
|
CaptchaToken string `json:"captchaToken"`
|
||||||
|
ClientSecret string `json:"clientSecret"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type Response struct {
|
type Response struct {
|
||||||
@ -98,7 +102,7 @@ type Captcha struct {
|
|||||||
// @router /signup [post]
|
// @router /signup [post]
|
||||||
func (c *ApiController) Signup() {
|
func (c *ApiController) Signup() {
|
||||||
if c.GetSessionUsername() != "" {
|
if c.GetSessionUsername() != "" {
|
||||||
c.ResponseError("Please sign out first before signing up", c.GetSessionUsername())
|
c.ResponseError(c.T("SignUpErr.SignOutFirst"), c.GetSessionUsername())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -111,21 +115,21 @@ func (c *ApiController) Signup() {
|
|||||||
|
|
||||||
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
||||||
if !application.EnableSignUp {
|
if !application.EnableSignUp {
|
||||||
c.ResponseError("The application does not allow to sign up new account")
|
c.ResponseError(c.T("SignUpErr.DoNotAllowSignUp"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
organization := object.GetOrganization(fmt.Sprintf("%s/%s", "admin", form.Organization))
|
organization := object.GetOrganization(fmt.Sprintf("%s/%s", "admin", form.Organization))
|
||||||
msg := object.CheckUserSignup(application, organization, form.Username, form.Password, form.Name, form.FirstName, form.LastName, form.Email, form.Phone, form.Affiliation)
|
msg := object.CheckUserSignup(application, organization, form.Username, form.Password, form.Name, form.FirstName, form.LastName, form.Email, form.Phone, form.Affiliation, c.GetAcceptLanguage())
|
||||||
if msg != "" {
|
if msg != "" {
|
||||||
c.ResponseError(msg)
|
c.ResponseError(msg)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if application.IsSignupItemVisible("Email") && application.GetSignupItemRule("Email") != "No verification" && form.Email != "" {
|
if application.IsSignupItemVisible("Email") && application.GetSignupItemRule("Email") != "No verification" && form.Email != "" {
|
||||||
checkResult := object.CheckVerificationCode(form.Email, form.EmailCode)
|
checkResult := object.CheckVerificationCode(form.Email, form.EmailCode, c.GetAcceptLanguage())
|
||||||
if len(checkResult) != 0 {
|
if len(checkResult) != 0 {
|
||||||
c.ResponseError(fmt.Sprintf("Email: %s", checkResult))
|
c.ResponseError(c.T("EmailErr.EmailCheckResult"), checkResult)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -133,9 +137,9 @@ func (c *ApiController) Signup() {
|
|||||||
var checkPhone string
|
var checkPhone string
|
||||||
if application.IsSignupItemVisible("Phone") && form.Phone != "" {
|
if application.IsSignupItemVisible("Phone") && form.Phone != "" {
|
||||||
checkPhone = fmt.Sprintf("+%s%s", form.PhonePrefix, form.Phone)
|
checkPhone = fmt.Sprintf("+%s%s", form.PhonePrefix, form.Phone)
|
||||||
checkResult := object.CheckVerificationCode(checkPhone, form.PhoneCode)
|
checkResult := object.CheckVerificationCode(checkPhone, form.PhoneCode, c.GetAcceptLanguage())
|
||||||
if len(checkResult) != 0 {
|
if len(checkResult) != 0 {
|
||||||
c.ResponseError(fmt.Sprintf("Phone: %s", checkResult))
|
c.ResponseError(c.T("PhoneErr.PhoneCheckResult"), checkResult)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -159,7 +163,7 @@ func (c *ApiController) Signup() {
|
|||||||
|
|
||||||
initScore, err := getInitScore()
|
initScore, err := getInitScore()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.ResponseError(fmt.Errorf("get init score failed, error: %w", err).Error())
|
c.ResponseError(fmt.Errorf(c.T("InitErr.InitScoreFailed"), err).Error())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -205,7 +209,7 @@ func (c *ApiController) Signup() {
|
|||||||
|
|
||||||
affected := object.AddUser(user)
|
affected := object.AddUser(user)
|
||||||
if !affected {
|
if !affected {
|
||||||
c.ResponseError(fmt.Sprintf("Failed to create user, user information is invalid: %s", util.StructToJson(user)))
|
c.ResponseError(c.T("UserErr.InvalidInformation"), util.StructToJson(user))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -258,17 +262,11 @@ func (c *ApiController) Logout() {
|
|||||||
// @Success 200 {object} controllers.Response The Response object
|
// @Success 200 {object} controllers.Response The Response object
|
||||||
// @router /get-account [get]
|
// @router /get-account [get]
|
||||||
func (c *ApiController) GetAccount() {
|
func (c *ApiController) GetAccount() {
|
||||||
userId, ok := c.RequireSignedIn()
|
user, ok := c.RequireSignedInUser()
|
||||||
if !ok {
|
if !ok {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
user := object.GetUser(userId)
|
|
||||||
if user == nil {
|
|
||||||
c.ResponseError(fmt.Sprintf("The user: %s doesn't exist", userId))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
managedAccounts := c.Input().Get("managedAccounts")
|
managedAccounts := c.Input().Get("managedAccounts")
|
||||||
if managedAccounts == "1" {
|
if managedAccounts == "1" {
|
||||||
user = object.ExtendManagedAccountsWithUser(user)
|
user = object.ExtendManagedAccountsWithUser(user)
|
||||||
@ -294,18 +292,16 @@ func (c *ApiController) GetAccount() {
|
|||||||
// @Success 200 {object} object.Userinfo The Response object
|
// @Success 200 {object} object.Userinfo The Response object
|
||||||
// @router /userinfo [get]
|
// @router /userinfo [get]
|
||||||
func (c *ApiController) GetUserinfo() {
|
func (c *ApiController) GetUserinfo() {
|
||||||
userId, ok := c.RequireSignedIn()
|
user, ok := c.RequireSignedInUser()
|
||||||
if !ok {
|
if !ok {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
scope, aud := c.GetSessionOidc()
|
scope, aud := c.GetSessionOidc()
|
||||||
host := c.Ctx.Request.Host
|
host := c.Ctx.Request.Host
|
||||||
resp, err := object.GetUserInfo(userId, scope, aud, host)
|
userInfo := object.GetUserInfo(user, scope, aud, host)
|
||||||
if err != nil {
|
|
||||||
c.ResponseError(err.Error())
|
c.Data["json"] = userInfo
|
||||||
return
|
|
||||||
}
|
|
||||||
c.Data["json"] = resp
|
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -317,7 +313,7 @@ func (c *ApiController) GetCaptcha() {
|
|||||||
applicationId := c.Input().Get("applicationId")
|
applicationId := c.Input().Get("applicationId")
|
||||||
isCurrentProvider := c.Input().Get("isCurrentProvider")
|
isCurrentProvider := c.Input().Get("isCurrentProvider")
|
||||||
|
|
||||||
captchaProvider, err := object.GetCaptchaProviderByApplication(applicationId, isCurrentProvider)
|
captchaProvider, err := object.GetCaptchaProviderByApplication(applicationId, isCurrentProvider, c.GetAcceptLanguage())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.ResponseError(err.Error())
|
c.ResponseError(err.Error())
|
||||||
return
|
return
|
||||||
|
@ -18,7 +18,7 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/astaxie/beego/utils/pagination"
|
"github.com/beego/beego/utils/pagination"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
@ -86,7 +86,7 @@ func (c *ApiController) GetUserApplication() {
|
|||||||
id := c.Input().Get("id")
|
id := c.Input().Get("id")
|
||||||
user := object.GetUser(id)
|
user := object.GetUser(id)
|
||||||
if user == nil {
|
if user == nil {
|
||||||
c.ResponseError(fmt.Sprintf("The user: %s doesn't exist", id))
|
c.ResponseError(fmt.Sprintf(c.T("UserErr.DoNotExist"), id))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -107,7 +107,7 @@ func (c *ApiController) GetOrganizationApplications() {
|
|||||||
organization := c.Input().Get("organization")
|
organization := c.Input().Get("organization")
|
||||||
|
|
||||||
if organization == "" {
|
if organization == "" {
|
||||||
c.ResponseError("Parameter organization is missing")
|
c.ResponseError(c.T("ParameterErr.OrgMissingErr"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -23,6 +23,8 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/casdoor/casdoor/captcha"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/conf"
|
"github.com/casdoor/casdoor/conf"
|
||||||
"github.com/casdoor/casdoor/idp"
|
"github.com/casdoor/casdoor/idp"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
@ -56,7 +58,7 @@ func (c *ApiController) HandleLoggedIn(application *object.Application, user *ob
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if !allowed {
|
if !allowed {
|
||||||
c.ResponseError("Unauthorized operation")
|
c.ResponseError(c.T("AuthErr.Unauthorized"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -75,10 +77,10 @@ func (c *ApiController) HandleLoggedIn(application *object.Application, user *ob
|
|||||||
codeChallenge := c.Input().Get("code_challenge")
|
codeChallenge := c.Input().Get("code_challenge")
|
||||||
|
|
||||||
if challengeMethod != "S256" && challengeMethod != "null" && challengeMethod != "" {
|
if challengeMethod != "S256" && challengeMethod != "null" && challengeMethod != "" {
|
||||||
c.ResponseError("Challenge method should be S256")
|
c.ResponseError(c.T("AuthErr.ChallengeMethodErr"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
code := object.GetOAuthCode(userId, clientId, responseType, redirectUri, scope, state, nonce, codeChallenge, c.Ctx.Request.Host)
|
code := object.GetOAuthCode(userId, clientId, responseType, redirectUri, scope, state, nonce, codeChallenge, c.Ctx.Request.Host, c.GetAcceptLanguage())
|
||||||
resp = codeToResponse(code)
|
resp = codeToResponse(code)
|
||||||
|
|
||||||
if application.EnableSigninSession || application.HasPromptPage() {
|
if application.EnableSigninSession || application.HasPromptPage() {
|
||||||
@ -151,7 +153,7 @@ func (c *ApiController) GetApplicationLogin() {
|
|||||||
scope := c.Input().Get("scope")
|
scope := c.Input().Get("scope")
|
||||||
state := c.Input().Get("state")
|
state := c.Input().Get("state")
|
||||||
|
|
||||||
msg, application := object.CheckOAuthLogin(clientId, responseType, redirectUri, scope, state)
|
msg, application := object.CheckOAuthLogin(clientId, responseType, redirectUri, scope, state, c.GetAcceptLanguage())
|
||||||
application = object.GetMaskedApplication(application, "")
|
application = object.GetMaskedApplication(application, "")
|
||||||
if msg != "" {
|
if msg != "" {
|
||||||
c.ResponseError(msg, application)
|
c.ResponseError(msg, application)
|
||||||
@ -196,7 +198,7 @@ func (c *ApiController) Login() {
|
|||||||
if form.Username != "" {
|
if form.Username != "" {
|
||||||
if form.Type == ResponseTypeLogin {
|
if form.Type == ResponseTypeLogin {
|
||||||
if c.GetSessionUsername() != "" {
|
if c.GetSessionUsername() != "" {
|
||||||
c.ResponseError("Please sign out first before signing in", c.GetSessionUsername())
|
c.ResponseError(c.T("LoginErr.SignOutFirst"), c.GetSessionUsername())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -218,11 +220,11 @@ func (c *ApiController) Login() {
|
|||||||
if user != nil && util.GetMaskedEmail(user.Email) == form.Username {
|
if user != nil && util.GetMaskedEmail(user.Email) == form.Username {
|
||||||
form.Username = user.Email
|
form.Username = user.Email
|
||||||
}
|
}
|
||||||
checkResult = object.CheckVerificationCode(form.Username, form.Code)
|
checkResult = object.CheckVerificationCode(form.Username, form.Code, c.GetAcceptLanguage())
|
||||||
} else {
|
} else {
|
||||||
verificationCodeType = "phone"
|
verificationCodeType = "phone"
|
||||||
if len(form.PhonePrefix) == 0 {
|
if len(form.PhonePrefix) == 0 {
|
||||||
responseText := fmt.Sprintf("%s%s", verificationCodeType, "No phone prefix")
|
responseText := fmt.Sprintf(c.T("PhoneErr.NoPrefix"), verificationCodeType)
|
||||||
c.ResponseError(responseText)
|
c.ResponseError(responseText)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -230,7 +232,7 @@ func (c *ApiController) Login() {
|
|||||||
form.Username = user.Phone
|
form.Username = user.Phone
|
||||||
}
|
}
|
||||||
checkPhone := fmt.Sprintf("+%s%s", form.PhonePrefix, form.Username)
|
checkPhone := fmt.Sprintf("+%s%s", form.PhonePrefix, form.Username)
|
||||||
checkResult = object.CheckVerificationCode(checkPhone, form.Code)
|
checkResult = object.CheckVerificationCode(checkPhone, form.Code, c.GetAcceptLanguage())
|
||||||
}
|
}
|
||||||
if len(checkResult) != 0 {
|
if len(checkResult) != 0 {
|
||||||
responseText := fmt.Sprintf("%s%s", verificationCodeType, checkResult)
|
responseText := fmt.Sprintf("%s%s", verificationCodeType, checkResult)
|
||||||
@ -247,12 +249,31 @@ func (c *ApiController) Login() {
|
|||||||
|
|
||||||
user = object.GetUserByFields(form.Organization, form.Username)
|
user = object.GetUserByFields(form.Organization, form.Username)
|
||||||
if user == nil {
|
if user == nil {
|
||||||
c.ResponseError(fmt.Sprintf("The user: %s/%s doesn't exist", form.Organization, form.Username))
|
c.ResponseError(fmt.Sprintf(c.T("LoginErr.UserDoNotExist"), form.Organization, form.Username))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
||||||
|
if application == nil {
|
||||||
|
c.ResponseError(fmt.Sprintf("The application: %s does not exist", form.Application))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if object.CheckToEnableCaptcha(application) {
|
||||||
|
isHuman, err := captcha.VerifyCaptchaByCaptchaType(form.CaptchaType, form.CaptchaToken, form.ClientSecret)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !isHuman {
|
||||||
|
c.ResponseError("Turing test failed.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
password := form.Password
|
password := form.Password
|
||||||
user, msg = object.CheckUserPassword(form.Organization, form.Username, password)
|
user, msg = object.CheckUserPassword(form.Organization, form.Username, password, c.GetAcceptLanguage())
|
||||||
}
|
}
|
||||||
|
|
||||||
if msg != "" {
|
if msg != "" {
|
||||||
@ -260,7 +281,7 @@ func (c *ApiController) Login() {
|
|||||||
} else {
|
} else {
|
||||||
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
||||||
if application == nil {
|
if application == nil {
|
||||||
c.ResponseError(fmt.Sprintf("The application: %s does not exist", form.Application))
|
c.ResponseError(fmt.Sprintf(c.T("LoginErr.AppDoNotExist"), form.Application))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -274,7 +295,7 @@ func (c *ApiController) Login() {
|
|||||||
} else if form.Provider != "" {
|
} else if form.Provider != "" {
|
||||||
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
||||||
if application == nil {
|
if application == nil {
|
||||||
c.ResponseError(fmt.Sprintf("The application: %s does not exist", form.Application))
|
c.ResponseError(fmt.Sprintf(c.T("LoginErr.AppDoNotExist"), form.Application))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -282,7 +303,7 @@ func (c *ApiController) Login() {
|
|||||||
provider := object.GetProvider(fmt.Sprintf("admin/%s", form.Provider))
|
provider := object.GetProvider(fmt.Sprintf("admin/%s", form.Provider))
|
||||||
providerItem := application.GetProviderItem(provider.Name)
|
providerItem := application.GetProviderItem(provider.Name)
|
||||||
if !providerItem.IsProviderVisible() {
|
if !providerItem.IsProviderVisible() {
|
||||||
c.ResponseError(fmt.Sprintf("The provider: %s is not enabled for the application", provider.Name))
|
c.ResponseError(fmt.Sprintf(c.T("ProviderErr.ProviderNotEnabled"), provider.Name))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -306,14 +327,14 @@ func (c *ApiController) Login() {
|
|||||||
|
|
||||||
idProvider := idp.GetIdProvider(provider.Type, provider.SubType, clientId, clientSecret, provider.AppId, form.RedirectUri, provider.Domain, provider.CustomAuthUrl, provider.CustomTokenUrl, provider.CustomUserInfoUrl)
|
idProvider := idp.GetIdProvider(provider.Type, provider.SubType, clientId, clientSecret, provider.AppId, form.RedirectUri, provider.Domain, provider.CustomAuthUrl, provider.CustomTokenUrl, provider.CustomUserInfoUrl)
|
||||||
if idProvider == nil {
|
if idProvider == nil {
|
||||||
c.ResponseError(fmt.Sprintf("The provider type: %s is not supported", provider.Type))
|
c.ResponseError(fmt.Sprintf(c.T("ProviderErr.ProviderNotSupported"), provider.Type))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
setHttpClient(idProvider, provider.Type)
|
setHttpClient(idProvider, provider.Type)
|
||||||
|
|
||||||
if form.State != conf.GetConfigString("authState") && form.State != application.Name {
|
if form.State != conf.GetConfigString("authState") && form.State != application.Name {
|
||||||
c.ResponseError(fmt.Sprintf("state expected: \"%s\", but got: \"%s\"", conf.GetConfigString("authState"), form.State))
|
c.ResponseError(fmt.Sprintf(c.T("AuthErr.AuthStateWrong"), conf.GetConfigString("authState"), form.State))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -325,13 +346,13 @@ func (c *ApiController) Login() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !token.Valid() {
|
if !token.Valid() {
|
||||||
c.ResponseError("Invalid token")
|
c.ResponseError(c.T("TokenErr.InvalidToken"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
userInfo, err = idProvider.GetUserInfo(token)
|
userInfo, err = idProvider.GetUserInfo(token)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.ResponseError(fmt.Sprintf("Failed to login in: %s", err.Error()))
|
c.ResponseError(fmt.Sprintf(c.T("LoginErr.LoginFail"), err.Error()))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -348,7 +369,7 @@ func (c *ApiController) Login() {
|
|||||||
// Sign in via OAuth (want to sign up but already have account)
|
// Sign in via OAuth (want to sign up but already have account)
|
||||||
|
|
||||||
if user.IsForbidden {
|
if user.IsForbidden {
|
||||||
c.ResponseError("the user is forbidden to sign in, please contact the administrator")
|
c.ResponseError(c.T("LoginErr.UserIsForbidden"))
|
||||||
}
|
}
|
||||||
|
|
||||||
resp = c.HandleLoggedIn(application, user, &form)
|
resp = c.HandleLoggedIn(application, user, &form)
|
||||||
@ -360,12 +381,12 @@ func (c *ApiController) Login() {
|
|||||||
} else if provider.Category == "OAuth" {
|
} else if provider.Category == "OAuth" {
|
||||||
// Sign up via OAuth
|
// Sign up via OAuth
|
||||||
if !application.EnableSignUp {
|
if !application.EnableSignUp {
|
||||||
c.ResponseError(fmt.Sprintf("The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support", provider.Type, userInfo.Username, userInfo.DisplayName))
|
c.ResponseError(fmt.Sprintf(c.T("LoginErr.AppNotEnableSignUp"), provider.Type, userInfo.Username, userInfo.DisplayName))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if !providerItem.CanSignUp {
|
if !providerItem.CanSignUp {
|
||||||
c.ResponseError(fmt.Sprintf("The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %s, please use another way to sign up", provider.Type, userInfo.Username, userInfo.DisplayName, provider.Type))
|
c.ResponseError(fmt.Sprintf(c.T("LoginErr.ProviderCanNotSignUp"), provider.Type, userInfo.Username, userInfo.DisplayName, provider.Type))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -386,7 +407,7 @@ func (c *ApiController) Login() {
|
|||||||
properties["no"] = strconv.Itoa(len(object.GetUsers(application.Organization)) + 2)
|
properties["no"] = strconv.Itoa(len(object.GetUsers(application.Organization)) + 2)
|
||||||
initScore, err := getInitScore()
|
initScore, err := getInitScore()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.ResponseError(fmt.Errorf("get init score failed, error: %w", err).Error())
|
c.ResponseError(fmt.Errorf(c.T("InitErr.InitScoreFailed"), err).Error())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -413,7 +434,7 @@ func (c *ApiController) Login() {
|
|||||||
|
|
||||||
affected := object.AddUser(user)
|
affected := object.AddUser(user)
|
||||||
if !affected {
|
if !affected {
|
||||||
c.ResponseError(fmt.Sprintf("Failed to create user, user information is invalid: %s", util.StructToJson(user)))
|
c.ResponseError(fmt.Sprintf(c.T("LoginErr.InvalidUserInformation"), util.StructToJson(user)))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -438,13 +459,13 @@ func (c *ApiController) Login() {
|
|||||||
} else { // form.Method != "signup"
|
} else { // form.Method != "signup"
|
||||||
userId := c.GetSessionUsername()
|
userId := c.GetSessionUsername()
|
||||||
if userId == "" {
|
if userId == "" {
|
||||||
c.ResponseError("The account does not exist", userInfo)
|
c.ResponseError(c.T("LoginErr.AccountDoNotExist"), userInfo)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
oldUser := object.GetUserByField(application.Organization, provider.Type, userInfo.Id)
|
oldUser := object.GetUserByField(application.Organization, provider.Type, userInfo.Id)
|
||||||
if oldUser != nil {
|
if oldUser != nil {
|
||||||
c.ResponseError(fmt.Sprintf("The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)", provider.Type, userInfo.Username, userInfo.DisplayName, oldUser.Name, oldUser.DisplayName))
|
c.ResponseError(fmt.Sprintf(c.T("LoginErr.OldUser"), provider.Type, userInfo.Username, userInfo.DisplayName, oldUser.Name, oldUser.DisplayName))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -465,7 +486,7 @@ func (c *ApiController) Login() {
|
|||||||
// user already signed in to Casdoor, so let the user click the avatar button to do the quick sign-in
|
// user already signed in to Casdoor, so let the user click the avatar button to do the quick sign-in
|
||||||
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
||||||
if application == nil {
|
if application == nil {
|
||||||
c.ResponseError(fmt.Sprintf("The application: %s does not exist", form.Application))
|
c.ResponseError(fmt.Sprintf(c.T("LoginErr.AppDoNotExist"), form.Application))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -477,7 +498,7 @@ func (c *ApiController) Login() {
|
|||||||
record.User = user.Name
|
record.User = user.Name
|
||||||
util.SafeGoroutine(func() { object.AddRecord(record) })
|
util.SafeGoroutine(func() { object.AddRecord(record) })
|
||||||
} else {
|
} else {
|
||||||
c.ResponseError(fmt.Sprintf("unknown authentication type (not password or provider), form = %s", util.StructToJson(form)))
|
c.ResponseError(fmt.Sprintf(c.T("LoginErr.UnknownAuthentication"), util.StructToJson(form)))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -489,7 +510,7 @@ func (c *ApiController) Login() {
|
|||||||
func (c *ApiController) GetSamlLogin() {
|
func (c *ApiController) GetSamlLogin() {
|
||||||
providerId := c.Input().Get("id")
|
providerId := c.Input().Get("id")
|
||||||
relayState := c.Input().Get("relayState")
|
relayState := c.Input().Get("relayState")
|
||||||
authURL, method, err := object.GenerateSamlLoginUrl(providerId, relayState)
|
authURL, method, err := object.GenerateSamlLoginUrl(providerId, relayState, c.GetAcceptLanguage())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.ResponseError(err.Error())
|
c.ResponseError(err.Error())
|
||||||
}
|
}
|
||||||
|
@ -18,8 +18,8 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/astaxie/beego"
|
"github.com/beego/beego"
|
||||||
"github.com/astaxie/beego/logs"
|
"github.com/beego/beego/logs"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
|
@ -210,7 +210,7 @@ func (c *RootController) SamlValidate() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !strings.HasPrefix(target, service) {
|
if !strings.HasPrefix(target, service) {
|
||||||
c.ResponseError(fmt.Sprintf("service %s and %s do not match", target, service))
|
c.ResponseError(fmt.Sprintf(c.T("CasErr.ServiceDoNotMatch"), target, service))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
94
controllers/casbin_adapter.go
Normal file
94
controllers/casbin_adapter.go
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
// Copyright 2022 The Casdoor Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// 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.
|
||||||
|
|
||||||
|
package controllers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
|
||||||
|
"github.com/beego/beego/utils/pagination"
|
||||||
|
"github.com/casdoor/casdoor/object"
|
||||||
|
"github.com/casdoor/casdoor/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (c *ApiController) GetCasbinAdapters() {
|
||||||
|
owner := c.Input().Get("owner")
|
||||||
|
limit := c.Input().Get("pageSize")
|
||||||
|
page := c.Input().Get("p")
|
||||||
|
field := c.Input().Get("field")
|
||||||
|
value := c.Input().Get("value")
|
||||||
|
sortField := c.Input().Get("sortField")
|
||||||
|
sortOrder := c.Input().Get("sortOrder")
|
||||||
|
if limit == "" || page == "" {
|
||||||
|
c.Data["json"] = object.GetCasbinAdapters(owner)
|
||||||
|
c.ServeJSON()
|
||||||
|
} else {
|
||||||
|
limit := util.ParseInt(limit)
|
||||||
|
paginator := pagination.SetPaginator(c.Ctx, limit, int64(object.GetCasbinAdapterCount(owner, field, value)))
|
||||||
|
adapters := object.GetPaginationCasbinAdapters(owner, paginator.Offset(), limit, field, value, sortField, sortOrder)
|
||||||
|
c.ResponseOk(adapters, paginator.Nums())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *ApiController) GetCasbinAdapter() {
|
||||||
|
id := c.Input().Get("id")
|
||||||
|
c.Data["json"] = object.GetCasbinAdapter(id)
|
||||||
|
c.ServeJSON()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *ApiController) UpdateCasbinAdapter() {
|
||||||
|
id := c.Input().Get("id")
|
||||||
|
|
||||||
|
var casbinAdapter object.CasbinAdapter
|
||||||
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &casbinAdapter)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.Data["json"] = wrapActionResponse(object.UpdateCasbinAdapter(id, &casbinAdapter))
|
||||||
|
c.ServeJSON()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *ApiController) AddCasbinAdapter() {
|
||||||
|
var casbinAdapter object.CasbinAdapter
|
||||||
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &casbinAdapter)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.Data["json"] = wrapActionResponse(object.AddCasbinAdapter(&casbinAdapter))
|
||||||
|
c.ServeJSON()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *ApiController) DeleteCasbinAdapter() {
|
||||||
|
var casbinAdapter object.CasbinAdapter
|
||||||
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &casbinAdapter)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.Data["json"] = wrapActionResponse(object.DeleteCasbinAdapter(&casbinAdapter))
|
||||||
|
c.ServeJSON()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *ApiController) SyncPolicies() {
|
||||||
|
id := c.Input().Get("id")
|
||||||
|
adapter := object.GetCasbinAdapter(id)
|
||||||
|
|
||||||
|
c.Data["json"] = object.SyncPolicies(adapter)
|
||||||
|
c.ServeJSON()
|
||||||
|
}
|
@ -17,7 +17,7 @@ package controllers
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/astaxie/beego/utils/pagination"
|
"github.com/beego/beego/utils/pagination"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
|
@ -23,7 +23,7 @@ import (
|
|||||||
func (c *ApiController) Enforce() {
|
func (c *ApiController) Enforce() {
|
||||||
userId := c.GetSessionUsername()
|
userId := c.GetSessionUsername()
|
||||||
if userId == "" {
|
if userId == "" {
|
||||||
c.ResponseError("Please sign in first")
|
c.ResponseError(c.T("EnforcerErr.SignInFirst"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -41,7 +41,7 @@ func (c *ApiController) Enforce() {
|
|||||||
func (c *ApiController) BatchEnforce() {
|
func (c *ApiController) BatchEnforce() {
|
||||||
userId := c.GetSessionUsername()
|
userId := c.GetSessionUsername()
|
||||||
if userId == "" {
|
if userId == "" {
|
||||||
c.ResponseError("Please sign in first")
|
c.ResponseError(c.T("EnforcerErr.SignInFirst"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -59,7 +59,7 @@ func (c *ApiController) BatchEnforce() {
|
|||||||
func (c *ApiController) GetAllObjects() {
|
func (c *ApiController) GetAllObjects() {
|
||||||
userId := c.GetSessionUsername()
|
userId := c.GetSessionUsername()
|
||||||
if userId == "" {
|
if userId == "" {
|
||||||
c.ResponseError("Please sign in first")
|
c.ResponseError(c.T("EnforcerErr.SignInFirst"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -70,7 +70,7 @@ func (c *ApiController) GetAllObjects() {
|
|||||||
func (c *ApiController) GetAllActions() {
|
func (c *ApiController) GetAllActions() {
|
||||||
userId := c.GetSessionUsername()
|
userId := c.GetSessionUsername()
|
||||||
if userId == "" {
|
if userId == "" {
|
||||||
c.ResponseError("Please sign in first")
|
c.ResponseError(c.T("EnforcerErr.SignInFirst"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -81,7 +81,7 @@ func (c *ApiController) GetAllActions() {
|
|||||||
func (c *ApiController) GetAllRoles() {
|
func (c *ApiController) GetAllRoles() {
|
||||||
userId := c.GetSessionUsername()
|
userId := c.GetSessionUsername()
|
||||||
if userId == "" {
|
if userId == "" {
|
||||||
c.ResponseError("Please sign in first")
|
c.ResponseError(c.T("EnforcerErr.SignInFirst"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ func (c *ApiController) GetLdapUser() {
|
|||||||
ldapServer := LdapServer{}
|
ldapServer := LdapServer{}
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &ldapServer)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &ldapServer)
|
||||||
if err != nil || util.IsStrsEmpty(ldapServer.Host, ldapServer.Admin, ldapServer.Passwd, ldapServer.BaseDn) {
|
if err != nil || util.IsStrsEmpty(ldapServer.Host, ldapServer.Admin, ldapServer.Passwd, ldapServer.BaseDn) {
|
||||||
c.ResponseError("Missing parameter")
|
c.ResponseError(c.T("ParameterErr.Missing"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -120,7 +120,7 @@ func (c *ApiController) GetLdap() {
|
|||||||
id := c.Input().Get("id")
|
id := c.Input().Get("id")
|
||||||
|
|
||||||
if util.IsStrsEmpty(id) {
|
if util.IsStrsEmpty(id) {
|
||||||
c.ResponseError("Missing parameter")
|
c.ResponseError(c.T("ParameterErr.Missing"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -136,17 +136,17 @@ func (c *ApiController) AddLdap() {
|
|||||||
var ldap object.Ldap
|
var ldap object.Ldap
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &ldap)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &ldap)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.ResponseError("Missing parameter")
|
c.ResponseError(c.T("ParameterErr.Missing"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if util.IsStrsEmpty(ldap.Owner, ldap.ServerName, ldap.Host, ldap.Admin, ldap.Passwd, ldap.BaseDn) {
|
if util.IsStrsEmpty(ldap.Owner, ldap.ServerName, ldap.Host, ldap.Admin, ldap.Passwd, ldap.BaseDn) {
|
||||||
c.ResponseError("Missing parameter")
|
c.ResponseError(c.T("ParameterErr.Missing"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if object.CheckLdapExist(&ldap) {
|
if object.CheckLdapExist(&ldap) {
|
||||||
c.ResponseError("Ldap server exist")
|
c.ResponseError(c.T("LdapErr.ServerExisted"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -171,7 +171,7 @@ func (c *ApiController) UpdateLdap() {
|
|||||||
var ldap object.Ldap
|
var ldap object.Ldap
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &ldap)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &ldap)
|
||||||
if err != nil || util.IsStrsEmpty(ldap.Owner, ldap.ServerName, ldap.Host, ldap.Admin, ldap.Passwd, ldap.BaseDn) {
|
if err != nil || util.IsStrsEmpty(ldap.Owner, ldap.ServerName, ldap.Host, ldap.Admin, ldap.Passwd, ldap.BaseDn) {
|
||||||
c.ResponseError("Missing parameter")
|
c.ResponseError(c.T("ParameterErr.Missing"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
118
controllers/ldapserver.go
Normal file
118
controllers/ldapserver.go
Normal file
@ -0,0 +1,118 @@
|
|||||||
|
// Copyright 2022 The Casdoor Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// 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.
|
||||||
|
|
||||||
|
package controllers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
|
||||||
|
"github.com/casdoor/casdoor/conf"
|
||||||
|
"github.com/casdoor/casdoor/object"
|
||||||
|
"github.com/forestmgy/ldapserver"
|
||||||
|
"github.com/lor00x/goldap/message"
|
||||||
|
)
|
||||||
|
|
||||||
|
func StartLdapServer() {
|
||||||
|
server := ldapserver.NewServer()
|
||||||
|
routes := ldapserver.NewRouteMux()
|
||||||
|
|
||||||
|
routes.Bind(handleBind)
|
||||||
|
routes.Search(handleSearch).Label(" SEARCH****")
|
||||||
|
|
||||||
|
server.Handle(routes)
|
||||||
|
server.ListenAndServe("0.0.0.0:" + conf.GetConfigString("ldapServerPort"))
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleBind(w ldapserver.ResponseWriter, m *ldapserver.Message) {
|
||||||
|
r := m.GetBindRequest()
|
||||||
|
res := ldapserver.NewBindResponse(ldapserver.LDAPResultSuccess)
|
||||||
|
|
||||||
|
if r.AuthenticationChoice() == "simple" {
|
||||||
|
bindusername, bindorg, err := object.GetNameAndOrgFromDN(string(r.Name()))
|
||||||
|
if err != "" {
|
||||||
|
log.Printf("Bind failed ,ErrMsg=%s", err)
|
||||||
|
res.SetResultCode(ldapserver.LDAPResultInvalidDNSyntax)
|
||||||
|
res.SetDiagnosticMessage("bind failed ErrMsg: " + err)
|
||||||
|
w.Write(res)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
bindpassword := string(r.AuthenticationSimple())
|
||||||
|
binduser, err := object.CheckUserPassword(bindorg, bindusername, bindpassword, "en")
|
||||||
|
if err != "" {
|
||||||
|
log.Printf("Bind failed User=%s, Pass=%#v, ErrMsg=%s", string(r.Name()), r.Authentication(), err)
|
||||||
|
res.SetResultCode(ldapserver.LDAPResultInvalidCredentials)
|
||||||
|
res.SetDiagnosticMessage("invalid credentials ErrMsg: " + err)
|
||||||
|
w.Write(res)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if bindorg == "built-in" {
|
||||||
|
m.Client.IsGlobalAdmin, m.Client.IsOrgAdmin = true, true
|
||||||
|
} else if binduser.IsAdmin {
|
||||||
|
m.Client.IsOrgAdmin = true
|
||||||
|
}
|
||||||
|
m.Client.IsAuthenticated = true
|
||||||
|
m.Client.UserName = bindusername
|
||||||
|
m.Client.OrgName = bindorg
|
||||||
|
} else {
|
||||||
|
res.SetResultCode(ldapserver.LDAPResultAuthMethodNotSupported)
|
||||||
|
res.SetDiagnosticMessage("Authentication method not supported,Please use Simple Authentication")
|
||||||
|
}
|
||||||
|
w.Write(res)
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleSearch(w ldapserver.ResponseWriter, m *ldapserver.Message) {
|
||||||
|
res := ldapserver.NewSearchResultDoneResponse(ldapserver.LDAPResultSuccess)
|
||||||
|
if !m.Client.IsAuthenticated {
|
||||||
|
res.SetResultCode(ldapserver.LDAPResultUnwillingToPerform)
|
||||||
|
w.Write(res)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
r := m.GetSearchRequest()
|
||||||
|
if r.FilterString() == "(objectClass=*)" {
|
||||||
|
w.Write(res)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
name, org, errCode := object.GetUserNameAndOrgFromBaseDnAndFilter(string(r.BaseObject()), r.FilterString())
|
||||||
|
if errCode != ldapserver.LDAPResultSuccess {
|
||||||
|
res.SetResultCode(errCode)
|
||||||
|
w.Write(res)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Handle Stop Signal (server stop / client disconnected / Abandoned request....)
|
||||||
|
select {
|
||||||
|
case <-m.Done:
|
||||||
|
log.Print("Leaving handleSearch...")
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
users, errCode := object.GetFilteredUsers(m, name, org)
|
||||||
|
if errCode != ldapserver.LDAPResultSuccess {
|
||||||
|
res.SetResultCode(errCode)
|
||||||
|
w.Write(res)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for i := 0; i < len(users); i++ {
|
||||||
|
user := users[i]
|
||||||
|
dn := fmt.Sprintf("cn=%s,%s", user.DisplayName, string(r.BaseObject()))
|
||||||
|
e := ldapserver.NewSearchResultEntry(dn)
|
||||||
|
e.AddAttribute("cn", message.AttributeValue(user.Name))
|
||||||
|
e.AddAttribute("uid", message.AttributeValue(user.Name))
|
||||||
|
e.AddAttribute("email", message.AttributeValue(user.Email))
|
||||||
|
e.AddAttribute("mobile", message.AttributeValue(user.Phone))
|
||||||
|
// e.AddAttribute("postalAddress", message.AttributeValue(user.Address[0]))
|
||||||
|
w.Write(e)
|
||||||
|
}
|
||||||
|
w.Write(res)
|
||||||
|
}
|
@ -29,7 +29,7 @@ type LinkForm struct {
|
|||||||
// @router /unlink [post]
|
// @router /unlink [post]
|
||||||
// @Tag Login API
|
// @Tag Login API
|
||||||
func (c *ApiController) Unlink() {
|
func (c *ApiController) Unlink() {
|
||||||
userId, ok := c.RequireSignedIn()
|
user, ok := c.RequireSignedInUser()
|
||||||
if !ok {
|
if !ok {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -44,11 +44,10 @@ func (c *ApiController) Unlink() {
|
|||||||
|
|
||||||
// the user will be unlinked from the provider
|
// the user will be unlinked from the provider
|
||||||
unlinkedUser := form.User
|
unlinkedUser := form.User
|
||||||
user := object.GetUser(userId)
|
|
||||||
|
|
||||||
if user.Id != unlinkedUser.Id && !user.IsGlobalAdmin {
|
if user.Id != unlinkedUser.Id && !user.IsGlobalAdmin {
|
||||||
// if the user is not the same as the one we are unlinking, we need to make sure the user is the global admin.
|
// if the user is not the same as the one we are unlinking, we need to make sure the user is the global admin.
|
||||||
c.ResponseError("You are not the global admin, you can't unlink other users")
|
c.ResponseError(c.T("AuthErr.CanNotUnlinkUsers"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -56,23 +55,23 @@ func (c *ApiController) Unlink() {
|
|||||||
// if the user is unlinking themselves, should check the provider can be unlinked, if not, we should return an error.
|
// if the user is unlinking themselves, should check the provider can be unlinked, if not, we should return an error.
|
||||||
application := object.GetApplicationByUser(user)
|
application := object.GetApplicationByUser(user)
|
||||||
if application == nil {
|
if application == nil {
|
||||||
c.ResponseError("You can't unlink yourself, you are not a member of any application")
|
c.ResponseError(c.T("AuthErr.CanNotLinkMySelf"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(application.Providers) == 0 {
|
if len(application.Providers) == 0 {
|
||||||
c.ResponseError("This application has no providers")
|
c.ResponseError(c.T("ApplicationErr.HasNoProviders"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
provider := application.GetProviderItemByType(providerType)
|
provider := application.GetProviderItemByType(providerType)
|
||||||
if provider == nil {
|
if provider == nil {
|
||||||
c.ResponseError("This application has no providers of type " + providerType)
|
c.ResponseError(c.T("ApplicationErr.HasNoProvidersOfType") + providerType)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if !provider.CanUnlink {
|
if !provider.CanUnlink {
|
||||||
c.ResponseError("This provider can't be unlinked")
|
c.ResponseError(c.T("ProviderErr.CanNotBeUnlinked"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -85,7 +84,7 @@ func (c *ApiController) Unlink() {
|
|||||||
value := object.GetUserField(&unlinkedUser, providerType)
|
value := object.GetUserField(&unlinkedUser, providerType)
|
||||||
|
|
||||||
if value == "" {
|
if value == "" {
|
||||||
c.ResponseError("Please link first", value)
|
c.ResponseError(c.T("ProviderErr.LinkFirstErr"), value)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ package controllers
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/astaxie/beego/utils/pagination"
|
"github.com/beego/beego/utils/pagination"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
|
@ -17,7 +17,7 @@ package controllers
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/astaxie/beego/utils/pagination"
|
"github.com/beego/beego/utils/pagination"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
@ -121,3 +121,24 @@ func (c *ApiController) DeleteOrganization() {
|
|||||||
c.Data["json"] = wrapActionResponse(object.DeleteOrganization(&organization))
|
c.Data["json"] = wrapActionResponse(object.DeleteOrganization(&organization))
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetDefaultApplication ...
|
||||||
|
// @Title GetDefaultApplication
|
||||||
|
// @Tag Organization API
|
||||||
|
// @Description get default application
|
||||||
|
// @Param id query string true "organization id"
|
||||||
|
// @Success 200 {object} Response The Response object
|
||||||
|
// @router /get-default-application [get]
|
||||||
|
func (c *ApiController) GetDefaultApplication() {
|
||||||
|
userId := c.GetSessionUsername()
|
||||||
|
id := c.Input().Get("id")
|
||||||
|
|
||||||
|
application, err := object.GetDefaultApplication(id)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
maskedApplication := object.GetMaskedApplication(application, userId)
|
||||||
|
c.ResponseOk(maskedApplication)
|
||||||
|
}
|
||||||
|
@ -18,7 +18,7 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/astaxie/beego/utils/pagination"
|
"github.com/beego/beego/utils/pagination"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
|
@ -17,7 +17,7 @@ package controllers
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/astaxie/beego/utils/pagination"
|
"github.com/beego/beego/utils/pagination"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
@ -55,13 +55,12 @@ func (c *ApiController) GetPermissions() {
|
|||||||
// @Success 200 {array} object.Permission The Response object
|
// @Success 200 {array} object.Permission The Response object
|
||||||
// @router /get-permissions-by-submitter [get]
|
// @router /get-permissions-by-submitter [get]
|
||||||
func (c *ApiController) GetPermissionsBySubmitter() {
|
func (c *ApiController) GetPermissionsBySubmitter() {
|
||||||
userId, ok := c.RequireSignedIn()
|
user, ok := c.RequireSignedInUser()
|
||||||
if !ok {
|
if !ok {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
owner, username := util.GetOwnerAndNameFromId(userId)
|
permissions := object.GetPermissionsBySubmitter(user.Owner, user.Name)
|
||||||
permissions := object.GetPermissionsBySubmitter(owner, username)
|
|
||||||
c.ResponseOk(permissions, len(permissions))
|
c.ResponseOk(permissions, len(permissions))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/astaxie/beego/utils/pagination"
|
"github.com/beego/beego/utils/pagination"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
@ -141,13 +141,13 @@ func (c *ApiController) BuyProduct() {
|
|||||||
|
|
||||||
userId := c.GetSessionUsername()
|
userId := c.GetSessionUsername()
|
||||||
if userId == "" {
|
if userId == "" {
|
||||||
c.ResponseError("Please login first")
|
c.ResponseError(c.T("LoginErr.LoginFirst"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
user := object.GetUser(userId)
|
user := object.GetUser(userId)
|
||||||
if user == nil {
|
if user == nil {
|
||||||
c.ResponseError(fmt.Sprintf("The user: %s doesn't exist", userId))
|
c.ResponseError(fmt.Sprintf(c.T("UserErr.DoNotExist"), userId))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ package controllers
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/astaxie/beego/utils/pagination"
|
"github.com/beego/beego/utils/pagination"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
|
@ -15,7 +15,9 @@
|
|||||||
package controllers
|
package controllers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/astaxie/beego/utils/pagination"
|
"encoding/json"
|
||||||
|
|
||||||
|
"github.com/beego/beego/utils/pagination"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
@ -29,6 +31,11 @@ import (
|
|||||||
// @Success 200 {object} object.Record The Response object
|
// @Success 200 {object} object.Record The Response object
|
||||||
// @router /get-records [get]
|
// @router /get-records [get]
|
||||||
func (c *ApiController) GetRecords() {
|
func (c *ApiController) GetRecords() {
|
||||||
|
organization, ok := c.RequireAdmin()
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
limit := c.Input().Get("pageSize")
|
limit := c.Input().Get("pageSize")
|
||||||
page := c.Input().Get("p")
|
page := c.Input().Get("p")
|
||||||
field := c.Input().Get("field")
|
field := c.Input().Get("field")
|
||||||
@ -40,8 +47,9 @@ func (c *ApiController) GetRecords() {
|
|||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
} else {
|
} else {
|
||||||
limit := util.ParseInt(limit)
|
limit := util.ParseInt(limit)
|
||||||
paginator := pagination.SetPaginator(c.Ctx, limit, int64(object.GetRecordCount(field, value)))
|
filterRecord := &object.Record{Organization: organization}
|
||||||
records := object.GetPaginationRecords(paginator.Offset(), limit, field, value, sortField, sortOrder)
|
paginator := pagination.SetPaginator(c.Ctx, limit, int64(object.GetRecordCount(field, value, filterRecord)))
|
||||||
|
records := object.GetPaginationRecords(paginator.Offset(), limit, field, value, sortField, sortOrder, filterRecord)
|
||||||
c.ResponseOk(records, paginator.Nums())
|
c.ResponseOk(records, paginator.Nums())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -66,3 +74,22 @@ func (c *ApiController) GetRecordsByFilter() {
|
|||||||
c.Data["json"] = object.GetRecordsByField(record)
|
c.Data["json"] = object.GetRecordsByField(record)
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// AddRecord
|
||||||
|
// @Title AddRecord
|
||||||
|
// @Tag Record API
|
||||||
|
// @Description add a record
|
||||||
|
// @Param body body object.Record true "The details of the record"
|
||||||
|
// @Success 200 {object} controllers.Response The Response object
|
||||||
|
// @router /add-record [post]
|
||||||
|
func (c *ApiController) AddRecord() {
|
||||||
|
var record object.Record
|
||||||
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &record)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.Data["json"] = wrapActionResponse(object.AddRecord(&record))
|
||||||
|
c.ServeJSON()
|
||||||
|
}
|
||||||
|
@ -22,7 +22,7 @@ import (
|
|||||||
"mime"
|
"mime"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"github.com/astaxie/beego/utils/pagination"
|
"github.com/beego/beego/utils/pagination"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
@ -113,7 +113,7 @@ func (c *ApiController) DeleteResource() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
err = object.DeleteFile(provider, resource.Name)
|
err = object.DeleteFile(provider, resource.Name, c.GetAcceptLanguage())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.ResponseError(err.Error())
|
c.ResponseError(err.Error())
|
||||||
return
|
return
|
||||||
@ -145,7 +145,7 @@ func (c *ApiController) UploadResource() {
|
|||||||
defer file.Close()
|
defer file.Close()
|
||||||
|
|
||||||
if username == "" || fullFilePath == "" {
|
if username == "" || fullFilePath == "" {
|
||||||
c.ResponseError(fmt.Sprintf("username or fullFilePath is empty: username = %s, fullFilePath = %s", username, fullFilePath))
|
c.ResponseError(fmt.Sprintf(c.T("ResourceErr.UsernameOrFilePathEmpty"), username, fullFilePath))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -205,7 +205,7 @@ func (c *ApiController) UploadResource() {
|
|||||||
if user == nil {
|
if user == nil {
|
||||||
user = object.GetUserNoCheck(username)
|
user = object.GetUserNoCheck(username)
|
||||||
if user == nil {
|
if user == nil {
|
||||||
c.ResponseError("user is nil for tag: \"avatar\"")
|
c.ResponseError(c.T("ResourceErr.UserIsNil"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,7 @@ package controllers
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/astaxie/beego/utils/pagination"
|
"github.com/beego/beego/utils/pagination"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
|
@ -25,7 +25,7 @@ func (c *ApiController) GetSamlMeta() {
|
|||||||
paramApp := c.Input().Get("application")
|
paramApp := c.Input().Get("application")
|
||||||
application := object.GetApplication(paramApp)
|
application := object.GetApplication(paramApp)
|
||||||
if application == nil {
|
if application == nil {
|
||||||
c.ResponseError(fmt.Sprintf("err: application %s not found", paramApp))
|
c.ResponseError(fmt.Sprintf(c.T("ApplicationErr.AppNotFound"), paramApp))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
metadata, _ := object.GetSamlMeta(application, host)
|
metadata, _ := object.GetSamlMeta(application, host)
|
||||||
|
@ -81,7 +81,7 @@ func (c *ApiController) SendEmail() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if util.IsStrsEmpty(emailForm.Title, emailForm.Content, emailForm.Sender) {
|
if util.IsStrsEmpty(emailForm.Title, emailForm.Content, emailForm.Sender) {
|
||||||
c.ResponseError(fmt.Sprintf("Empty parameters for emailForm: %v", emailForm))
|
c.ResponseError(fmt.Sprintf(c.T("EmailErr.EmptyParam"), emailForm))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -93,7 +93,7 @@ func (c *ApiController) SendEmail() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if len(invalidReceivers) != 0 {
|
if len(invalidReceivers) != 0 {
|
||||||
c.ResponseError(fmt.Sprintf("Invalid Email receivers: %s", invalidReceivers))
|
c.ResponseError(fmt.Sprintf(c.T("EmailErr.InvalidReceivers"), invalidReceivers))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -141,7 +141,7 @@ func (c *ApiController) SendSms() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if len(invalidReceivers) != 0 {
|
if len(invalidReceivers) != 0 {
|
||||||
c.ResponseError(fmt.Sprintf("Invalid phone receivers: %s", invalidReceivers))
|
c.ResponseError(fmt.Sprintf(c.T("PhoneErr.InvalidReceivers"), invalidReceivers))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ package controllers
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/astaxie/beego/utils/pagination"
|
"github.com/beego/beego/utils/pagination"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
|
@ -40,7 +40,7 @@ func (c *ApiController) GetSystemInfo() {
|
|||||||
|
|
||||||
user := object.GetUser(id)
|
user := object.GetUser(id)
|
||||||
if user == nil || !user.IsGlobalAdmin {
|
if user == nil || !user.IsGlobalAdmin {
|
||||||
c.ResponseError("You are not authorized to access this resource")
|
c.ResponseError(c.T("ResourceErr.NotAuthorized"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/astaxie/beego/utils/pagination"
|
"github.com/beego/beego/utils/pagination"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
@ -150,12 +150,12 @@ func (c *ApiController) GetOAuthCode() {
|
|||||||
codeChallenge := c.Input().Get("code_challenge")
|
codeChallenge := c.Input().Get("code_challenge")
|
||||||
|
|
||||||
if challengeMethod != "S256" && challengeMethod != "null" && challengeMethod != "" {
|
if challengeMethod != "S256" && challengeMethod != "null" && challengeMethod != "" {
|
||||||
c.ResponseError("Challenge method should be S256")
|
c.ResponseError(c.T("AuthErr.ChallengeMethodErr"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
host := c.Ctx.Request.Host
|
host := c.Ctx.Request.Host
|
||||||
|
|
||||||
c.Data["json"] = object.GetOAuthCode(userId, clientId, responseType, redirectUri, scope, state, nonce, codeChallenge, host)
|
c.Data["json"] = object.GetOAuthCode(userId, clientId, responseType, redirectUri, scope, state, nonce, codeChallenge, host, c.GetAcceptLanguage())
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -204,7 +204,7 @@ func (c *ApiController) GetOAuthToken() {
|
|||||||
}
|
}
|
||||||
host := c.Ctx.Request.Host
|
host := c.Ctx.Request.Host
|
||||||
|
|
||||||
c.Data["json"] = object.GetOAuthToken(grantType, clientId, clientSecret, code, verifier, scope, username, password, host, tag, avatar)
|
c.Data["json"] = object.GetOAuthToken(grantType, clientId, clientSecret, code, verifier, scope, username, password, host, tag, avatar, c.GetAcceptLanguage())
|
||||||
c.SetTokenErrorHttpStatus()
|
c.SetTokenErrorHttpStatus()
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
@ -290,7 +290,7 @@ func (c *ApiController) IntrospectToken() {
|
|||||||
clientId = c.Input().Get("client_id")
|
clientId = c.Input().Get("client_id")
|
||||||
clientSecret = c.Input().Get("client_secret")
|
clientSecret = c.Input().Get("client_secret")
|
||||||
if clientId == "" || clientSecret == "" {
|
if clientId == "" || clientSecret == "" {
|
||||||
c.ResponseError("empty clientId or clientSecret")
|
c.ResponseError(c.T("TokenErr.EmptyClientID"))
|
||||||
c.Data["json"] = &object.TokenError{
|
c.Data["json"] = &object.TokenError{
|
||||||
Error: object.InvalidRequest,
|
Error: object.InvalidRequest,
|
||||||
}
|
}
|
||||||
@ -301,7 +301,7 @@ func (c *ApiController) IntrospectToken() {
|
|||||||
}
|
}
|
||||||
application := object.GetApplicationByClientId(clientId)
|
application := object.GetApplicationByClientId(clientId)
|
||||||
if application == nil || application.ClientSecret != clientSecret {
|
if application == nil || application.ClientSecret != clientSecret {
|
||||||
c.ResponseError("invalid application or wrong clientSecret")
|
c.ResponseError(c.T("TokenErr.InvalidAppOrWrongClientSecret"))
|
||||||
c.Data["json"] = &object.TokenError{
|
c.Data["json"] = &object.TokenError{
|
||||||
Error: object.InvalidClient,
|
Error: object.InvalidClient,
|
||||||
}
|
}
|
||||||
|
@ -19,7 +19,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/astaxie/beego/utils/pagination"
|
"github.com/beego/beego/utils/pagination"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
@ -100,7 +100,7 @@ func (c *ApiController) GetUser() {
|
|||||||
organization := object.GetOrganization(fmt.Sprintf("%s/%s", "admin", owner))
|
organization := object.GetOrganization(fmt.Sprintf("%s/%s", "admin", owner))
|
||||||
if !organization.IsProfilePublic {
|
if !organization.IsProfilePublic {
|
||||||
requestUserId := c.GetSessionUsername()
|
requestUserId := c.GetSessionUsername()
|
||||||
hasPermission, err := object.CheckUserPermission(requestUserId, id, owner, false)
|
hasPermission, err := object.CheckUserPermission(requestUserId, id, owner, false, c.GetAcceptLanguage())
|
||||||
if !hasPermission {
|
if !hasPermission {
|
||||||
c.ResponseError(err.Error())
|
c.ResponseError(err.Error())
|
||||||
return
|
return
|
||||||
@ -149,7 +149,7 @@ func (c *ApiController) UpdateUser() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if user.DisplayName == "" {
|
if user.DisplayName == "" {
|
||||||
c.ResponseError("Display name cannot be empty")
|
c.ResponseError(c.T("UserErr.DisplayNameCanNotBeEmpty"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -183,6 +183,12 @@ func (c *ApiController) AddUser() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
msg := object.CheckUsername(user.Name, c.GetAcceptLanguage())
|
||||||
|
if msg != "" {
|
||||||
|
c.ResponseError(msg)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.AddUser(&user))
|
c.Data["json"] = wrapActionResponse(object.AddUser(&user))
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
@ -224,7 +230,7 @@ func (c *ApiController) GetEmailAndPhone() {
|
|||||||
|
|
||||||
user := object.GetUserByFields(form.Organization, form.Username)
|
user := object.GetUserByFields(form.Organization, form.Username)
|
||||||
if user == nil {
|
if user == nil {
|
||||||
c.ResponseError(fmt.Sprintf("The user: %s/%s doesn't exist", form.Organization, form.Username))
|
c.ResponseError(fmt.Sprintf(c.T("UserErr.DoNotExistInOrg"), form.Organization, form.Username))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -265,7 +271,7 @@ func (c *ApiController) SetPassword() {
|
|||||||
requestUserId := c.GetSessionUsername()
|
requestUserId := c.GetSessionUsername()
|
||||||
userId := fmt.Sprintf("%s/%s", userOwner, userName)
|
userId := fmt.Sprintf("%s/%s", userOwner, userName)
|
||||||
|
|
||||||
hasPermission, err := object.CheckUserPermission(requestUserId, userId, userOwner, true)
|
hasPermission, err := object.CheckUserPermission(requestUserId, userId, userOwner, true, c.GetAcceptLanguage())
|
||||||
if !hasPermission {
|
if !hasPermission {
|
||||||
c.ResponseError(err.Error())
|
c.ResponseError(err.Error())
|
||||||
return
|
return
|
||||||
@ -274,7 +280,7 @@ func (c *ApiController) SetPassword() {
|
|||||||
targetUser := object.GetUser(userId)
|
targetUser := object.GetUser(userId)
|
||||||
|
|
||||||
if oldPassword != "" {
|
if oldPassword != "" {
|
||||||
msg := object.CheckPassword(targetUser, oldPassword)
|
msg := object.CheckPassword(targetUser, oldPassword, c.GetAcceptLanguage())
|
||||||
if msg != "" {
|
if msg != "" {
|
||||||
c.ResponseError(msg)
|
c.ResponseError(msg)
|
||||||
return
|
return
|
||||||
@ -282,12 +288,12 @@ func (c *ApiController) SetPassword() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if strings.Contains(newPassword, " ") {
|
if strings.Contains(newPassword, " ") {
|
||||||
c.ResponseError("New password cannot contain blank space.")
|
c.ResponseError(c.T("SetPasswordErr.CanNotContainBlank"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(newPassword) <= 5 {
|
if len(newPassword) <= 5 {
|
||||||
c.ResponseError("New password must have at least 6 characters")
|
c.ResponseError(c.T("SetPasswordErr.LessThanSixCharacters"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -309,7 +315,7 @@ func (c *ApiController) CheckUserPassword() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
_, msg := object.CheckUserPassword(user.Owner, user.Name, user.Password)
|
_, msg := object.CheckUserPassword(user.Owner, user.Name, user.Password, c.GetAcceptLanguage())
|
||||||
if msg == "" {
|
if msg == "" {
|
||||||
c.ResponseOk()
|
c.ResponseOk()
|
||||||
} else {
|
} else {
|
||||||
|
@ -61,6 +61,6 @@ func (c *ApiController) UploadUsers() {
|
|||||||
if affected {
|
if affected {
|
||||||
c.ResponseOk()
|
c.ResponseOk()
|
||||||
} else {
|
} else {
|
||||||
c.ResponseError("Failed to import users")
|
c.ResponseError(c.T("UserErr.FailToImportUsers"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,7 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/conf"
|
"github.com/casdoor/casdoor/conf"
|
||||||
|
"github.com/casdoor/casdoor/i18n"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
@ -48,6 +49,19 @@ func (c *ApiController) ResponseError(error string, data ...interface{}) {
|
|||||||
c.ResponseJsonData(resp, data...)
|
c.ResponseJsonData(resp, data...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *ApiController) T(error string) string {
|
||||||
|
return i18n.Translate(c.GetAcceptLanguage(), error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetAcceptLanguage ...
|
||||||
|
func (c *ApiController) GetAcceptLanguage() string {
|
||||||
|
lang := c.Ctx.Request.Header.Get("Accept-Language")
|
||||||
|
if lang == "" {
|
||||||
|
lang = "en"
|
||||||
|
}
|
||||||
|
return lang[0:2]
|
||||||
|
}
|
||||||
|
|
||||||
// SetTokenErrorHttpStatus ...
|
// SetTokenErrorHttpStatus ...
|
||||||
func (c *ApiController) SetTokenErrorHttpStatus() {
|
func (c *ApiController) SetTokenErrorHttpStatus() {
|
||||||
_, ok := c.Data["json"].(*object.TokenError)
|
_, ok := c.Data["json"].(*object.TokenError)
|
||||||
@ -69,12 +83,40 @@ func (c *ApiController) SetTokenErrorHttpStatus() {
|
|||||||
func (c *ApiController) RequireSignedIn() (string, bool) {
|
func (c *ApiController) RequireSignedIn() (string, bool) {
|
||||||
userId := c.GetSessionUsername()
|
userId := c.GetSessionUsername()
|
||||||
if userId == "" {
|
if userId == "" {
|
||||||
c.ResponseError("Please sign in first")
|
c.ResponseError(c.T("LoginErr.LoginFirst"), "Please login first")
|
||||||
return "", false
|
return "", false
|
||||||
}
|
}
|
||||||
return userId, true
|
return userId, true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RequireSignedInUser ...
|
||||||
|
func (c *ApiController) RequireSignedInUser() (*object.User, bool) {
|
||||||
|
userId, ok := c.RequireSignedIn()
|
||||||
|
if !ok {
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
|
||||||
|
user := object.GetUser(userId)
|
||||||
|
if user == nil {
|
||||||
|
c.ResponseError(fmt.Sprintf(c.T("UserErr.DoNotExist"), userId))
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
return user, true
|
||||||
|
}
|
||||||
|
|
||||||
|
// RequireAdmin ...
|
||||||
|
func (c *ApiController) RequireAdmin() (string, bool) {
|
||||||
|
user, ok := c.RequireSignedInUser()
|
||||||
|
if !ok {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
|
||||||
|
if user.Owner == "built-in" {
|
||||||
|
return "", true
|
||||||
|
}
|
||||||
|
return user.Owner, true
|
||||||
|
}
|
||||||
|
|
||||||
func getInitScore() (int, error) {
|
func getInitScore() (int, error) {
|
||||||
return strconv.Atoi(conf.GetConfigString("initScore"))
|
return strconv.Atoi(conf.GetConfigString("initScore"))
|
||||||
}
|
}
|
||||||
@ -84,7 +126,7 @@ func (c *ApiController) GetProviderFromContext(category string) (*object.Provide
|
|||||||
if providerName != "" {
|
if providerName != "" {
|
||||||
provider := object.GetProvider(util.GetId(providerName))
|
provider := object.GetProvider(util.GetId(providerName))
|
||||||
if provider == nil {
|
if provider == nil {
|
||||||
c.ResponseError(fmt.Sprintf("The provider: %s is not found", providerName))
|
c.ResponseError(c.T("ProviderErr.ProviderNotFound"), providerName)
|
||||||
return nil, nil, false
|
return nil, nil, false
|
||||||
}
|
}
|
||||||
return provider, nil, true
|
return provider, nil, true
|
||||||
@ -97,13 +139,13 @@ func (c *ApiController) GetProviderFromContext(category string) (*object.Provide
|
|||||||
|
|
||||||
application, user := object.GetApplicationByUserId(userId)
|
application, user := object.GetApplicationByUserId(userId)
|
||||||
if application == nil {
|
if application == nil {
|
||||||
c.ResponseError(fmt.Sprintf("No application is found for userId: \"%s\"", userId))
|
c.ResponseError(fmt.Sprintf(c.T("ApplicationErr.AppNotFoundForUserID"), userId))
|
||||||
return nil, nil, false
|
return nil, nil, false
|
||||||
}
|
}
|
||||||
|
|
||||||
provider := application.GetProviderByCategory(category)
|
provider := application.GetProviderByCategory(category)
|
||||||
if provider == nil {
|
if provider == nil {
|
||||||
c.ResponseError(fmt.Sprintf("No provider for category: \"%s\" is found for application: %s", category, application.Name))
|
c.ResponseError(fmt.Sprintf(c.T("ProviderErr.ProviderNotFoundForCategory"), category, application.Name))
|
||||||
return nil, nil, false
|
return nil, nil, false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -50,23 +50,23 @@ func (c *ApiController) SendVerificationCode() {
|
|||||||
remoteAddr := util.GetIPFromRequest(c.Ctx.Request)
|
remoteAddr := util.GetIPFromRequest(c.Ctx.Request)
|
||||||
|
|
||||||
if destType == "" {
|
if destType == "" {
|
||||||
c.ResponseError("Missing parameter: type.")
|
c.ResponseError(c.T("ParameterErr.Missing") + ": type.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if dest == "" {
|
if dest == "" {
|
||||||
c.ResponseError("Missing parameter: dest.")
|
c.ResponseError(c.T("ParameterErr.Missing") + ": dest.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if applicationId == "" {
|
if applicationId == "" {
|
||||||
c.ResponseError("Missing parameter: applicationId.")
|
c.ResponseError(c.T("ParameterErr.Missing") + ": applicationId.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if !strings.Contains(applicationId, "/") {
|
if !strings.Contains(applicationId, "/") {
|
||||||
c.ResponseError("Wrong parameter: applicationId.")
|
c.ResponseError(c.T("ParameterErr.Wrong") + ": applicationId.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if checkType == "" {
|
if checkType == "" {
|
||||||
c.ResponseError("Missing parameter: checkType.")
|
c.ResponseError(c.T("ParameterErr.Missing") + ": checkType.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -74,7 +74,7 @@ func (c *ApiController) SendVerificationCode() {
|
|||||||
|
|
||||||
if captchaProvider != nil {
|
if captchaProvider != nil {
|
||||||
if checkKey == "" {
|
if checkKey == "" {
|
||||||
c.ResponseError("Missing parameter: checkKey.")
|
c.ResponseError(c.T("ParameterErr.Missing") + ": checkKey.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
isHuman, err := captchaProvider.VerifyCaptcha(checkKey, checkId)
|
isHuman, err := captchaProvider.VerifyCaptcha(checkKey, checkId)
|
||||||
@ -84,7 +84,7 @@ func (c *ApiController) SendVerificationCode() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !isHuman {
|
if !isHuman {
|
||||||
c.ResponseError("Turing test failed.")
|
c.ResponseError(c.T("AuthErr.NotHuman"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -94,7 +94,7 @@ func (c *ApiController) SendVerificationCode() {
|
|||||||
organization := object.GetOrganization(fmt.Sprintf("%s/%s", application.Owner, application.Organization))
|
organization := object.GetOrganization(fmt.Sprintf("%s/%s", application.Owner, application.Organization))
|
||||||
|
|
||||||
if checkUser == "true" && user == nil && object.GetUserByFields(organization.Name, dest) == nil {
|
if checkUser == "true" && user == nil && object.GetUserByFields(organization.Name, dest) == nil {
|
||||||
c.ResponseError("Please login first")
|
c.ResponseError(c.T("LoginErr.LoginFirst"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -110,7 +110,7 @@ func (c *ApiController) SendVerificationCode() {
|
|||||||
dest = user.Email
|
dest = user.Email
|
||||||
}
|
}
|
||||||
if !util.IsEmailValid(dest) {
|
if !util.IsEmailValid(dest) {
|
||||||
c.ResponseError("Invalid Email address")
|
c.ResponseError(c.T("EmailErr.EmailInvalid"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -121,11 +121,11 @@ func (c *ApiController) SendVerificationCode() {
|
|||||||
dest = user.Phone
|
dest = user.Phone
|
||||||
}
|
}
|
||||||
if !util.IsPhoneCnValid(dest) {
|
if !util.IsPhoneCnValid(dest) {
|
||||||
c.ResponseError("Invalid phone number")
|
c.ResponseError(c.T("PhoneErr.NumberInvalid"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if organization == nil {
|
if organization == nil {
|
||||||
c.ResponseError("The organization doesn't exist.")
|
c.ResponseError(c.T("OrgErr.DoNotExist"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -148,22 +148,16 @@ func (c *ApiController) SendVerificationCode() {
|
|||||||
// @Title ResetEmailOrPhone
|
// @Title ResetEmailOrPhone
|
||||||
// @router /api/reset-email-or-phone [post]
|
// @router /api/reset-email-or-phone [post]
|
||||||
func (c *ApiController) ResetEmailOrPhone() {
|
func (c *ApiController) ResetEmailOrPhone() {
|
||||||
userId, ok := c.RequireSignedIn()
|
user, ok := c.RequireSignedInUser()
|
||||||
if !ok {
|
if !ok {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
user := object.GetUser(userId)
|
|
||||||
if user == nil {
|
|
||||||
c.ResponseError(fmt.Sprintf("The user: %s doesn't exist", userId))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
destType := c.Ctx.Request.Form.Get("type")
|
destType := c.Ctx.Request.Form.Get("type")
|
||||||
dest := c.Ctx.Request.Form.Get("dest")
|
dest := c.Ctx.Request.Form.Get("dest")
|
||||||
code := c.Ctx.Request.Form.Get("code")
|
code := c.Ctx.Request.Form.Get("code")
|
||||||
if len(dest) == 0 || len(code) == 0 || len(destType) == 0 {
|
if len(dest) == 0 || len(code) == 0 || len(destType) == 0 {
|
||||||
c.ResponseError("Missing parameter.")
|
c.ResponseError(c.T("ParameterErr.Missing"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -172,11 +166,11 @@ func (c *ApiController) ResetEmailOrPhone() {
|
|||||||
if destType == "phone" {
|
if destType == "phone" {
|
||||||
phoneItem := object.GetAccountItemByName("Phone", org)
|
phoneItem := object.GetAccountItemByName("Phone", org)
|
||||||
if phoneItem == nil {
|
if phoneItem == nil {
|
||||||
c.ResponseError("Unable to get the phone modify rule.")
|
c.ResponseError(c.T("PhoneErr.UnableGetModifyRule"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if pass, errMsg := object.CheckAccountItemModifyRule(phoneItem, user); !pass {
|
if pass, errMsg := object.CheckAccountItemModifyRule(phoneItem, user, c.GetAcceptLanguage()); !pass {
|
||||||
c.ResponseError(errMsg)
|
c.ResponseError(errMsg)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -189,16 +183,16 @@ func (c *ApiController) ResetEmailOrPhone() {
|
|||||||
} else if destType == "email" {
|
} else if destType == "email" {
|
||||||
emailItem := object.GetAccountItemByName("Email", org)
|
emailItem := object.GetAccountItemByName("Email", org)
|
||||||
if emailItem == nil {
|
if emailItem == nil {
|
||||||
c.ResponseError("Unable to get the email modify rule.")
|
c.ResponseError(c.T("EmailErr.UnableGetModifyRule"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if pass, errMsg := object.CheckAccountItemModifyRule(emailItem, user); !pass {
|
if pass, errMsg := object.CheckAccountItemModifyRule(emailItem, user, c.GetAcceptLanguage()); !pass {
|
||||||
c.ResponseError(errMsg)
|
c.ResponseError(errMsg)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ret := object.CheckVerificationCode(checkDest, code); len(ret) != 0 {
|
if ret := object.CheckVerificationCode(checkDest, code, c.GetAcceptLanguage()); len(ret) != 0 {
|
||||||
c.ResponseError(ret)
|
c.ResponseError(ret)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -211,7 +205,7 @@ func (c *ApiController) ResetEmailOrPhone() {
|
|||||||
user.Phone = dest
|
user.Phone = dest
|
||||||
object.SetUserField(user, "phone", user.Phone)
|
object.SetUserField(user, "phone", user.Phone)
|
||||||
default:
|
default:
|
||||||
c.ResponseError("Unknown type.")
|
c.ResponseError(c.T("ParameterErr.UnknownType"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -230,17 +224,17 @@ func (c *ApiController) VerifyCaptcha() {
|
|||||||
captchaToken := c.Ctx.Request.Form.Get("captchaToken")
|
captchaToken := c.Ctx.Request.Form.Get("captchaToken")
|
||||||
clientSecret := c.Ctx.Request.Form.Get("clientSecret")
|
clientSecret := c.Ctx.Request.Form.Get("clientSecret")
|
||||||
if captchaToken == "" {
|
if captchaToken == "" {
|
||||||
c.ResponseError("Missing parameter: captchaToken.")
|
c.ResponseError(c.T("ParameterErr.Missing") + ": captchaToken.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if clientSecret == "" {
|
if clientSecret == "" {
|
||||||
c.ResponseError("Missing parameter: clientSecret.")
|
c.ResponseError(c.T("ParameterErr.Missing") + ": clientSecret.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
provider := captcha.GetCaptchaProvider(captchaType)
|
provider := captcha.GetCaptchaProvider(captchaType)
|
||||||
if provider == nil {
|
if provider == nil {
|
||||||
c.ResponseError("Invalid captcha provider.")
|
c.ResponseError(c.T("ProviderErr.InvalidProvider"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -16,6 +16,7 @@ package controllers
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
@ -34,7 +35,7 @@ func (c *ApiController) WebAuthnSignupBegin() {
|
|||||||
webauthnObj := object.GetWebAuthnObject(c.Ctx.Request.Host)
|
webauthnObj := object.GetWebAuthnObject(c.Ctx.Request.Host)
|
||||||
user := c.getCurrentUser()
|
user := c.getCurrentUser()
|
||||||
if user == nil {
|
if user == nil {
|
||||||
c.ResponseError("Please login first.")
|
c.ResponseError(c.T("LoginErr.LoginFirst"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -65,13 +66,13 @@ func (c *ApiController) WebAuthnSignupFinish() {
|
|||||||
webauthnObj := object.GetWebAuthnObject(c.Ctx.Request.Host)
|
webauthnObj := object.GetWebAuthnObject(c.Ctx.Request.Host)
|
||||||
user := c.getCurrentUser()
|
user := c.getCurrentUser()
|
||||||
if user == nil {
|
if user == nil {
|
||||||
c.ResponseError("Please login first.")
|
c.ResponseError(c.T("LoginErr.LoginFirst"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
sessionObj := c.GetSession("registration")
|
sessionObj := c.GetSession("registration")
|
||||||
sessionData, ok := sessionObj.(webauthn.SessionData)
|
sessionData, ok := sessionObj.(webauthn.SessionData)
|
||||||
if !ok {
|
if !ok {
|
||||||
c.ResponseError("Please call WebAuthnSignupBegin first")
|
c.ResponseError(c.T("AuthErr.CallWebAuthnSigninBegin"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
c.Ctx.Request.Body = io.NopCloser(bytes.NewBuffer(c.Ctx.Input.RequestBody))
|
c.Ctx.Request.Body = io.NopCloser(bytes.NewBuffer(c.Ctx.Input.RequestBody))
|
||||||
@ -100,7 +101,7 @@ func (c *ApiController) WebAuthnSigninBegin() {
|
|||||||
userName := c.Input().Get("name")
|
userName := c.Input().Get("name")
|
||||||
user := object.GetUserByFields(userOwner, userName)
|
user := object.GetUserByFields(userOwner, userName)
|
||||||
if user == nil {
|
if user == nil {
|
||||||
c.ResponseError("Please Giveout Owner and Username.")
|
c.ResponseError(fmt.Sprintf(c.T("UserErr.DoNotExistInOrg"), userOwner, userName))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
options, sessionData, err := webauthnObj.BeginLogin(user)
|
options, sessionData, err := webauthnObj.BeginLogin(user)
|
||||||
@ -121,11 +122,12 @@ func (c *ApiController) WebAuthnSigninBegin() {
|
|||||||
// @Success 200 {object} Response "The Response object"
|
// @Success 200 {object} Response "The Response object"
|
||||||
// @router /webauthn/signin/finish [post]
|
// @router /webauthn/signin/finish [post]
|
||||||
func (c *ApiController) WebAuthnSigninFinish() {
|
func (c *ApiController) WebAuthnSigninFinish() {
|
||||||
|
responseType := c.Input().Get("responseType")
|
||||||
webauthnObj := object.GetWebAuthnObject(c.Ctx.Request.Host)
|
webauthnObj := object.GetWebAuthnObject(c.Ctx.Request.Host)
|
||||||
sessionObj := c.GetSession("authentication")
|
sessionObj := c.GetSession("authentication")
|
||||||
sessionData, ok := sessionObj.(webauthn.SessionData)
|
sessionData, ok := sessionObj.(webauthn.SessionData)
|
||||||
if !ok {
|
if !ok {
|
||||||
c.ResponseError("Please call WebAuthnSigninBegin first")
|
c.ResponseError(c.T("AuthErr.CallWebAuthnSigninBegin"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
c.Ctx.Request.Body = io.NopCloser(bytes.NewBuffer(c.Ctx.Input.RequestBody))
|
c.Ctx.Request.Body = io.NopCloser(bytes.NewBuffer(c.Ctx.Input.RequestBody))
|
||||||
@ -138,5 +140,11 @@ func (c *ApiController) WebAuthnSigninFinish() {
|
|||||||
}
|
}
|
||||||
c.SetSessionUsername(userId)
|
c.SetSessionUsername(userId)
|
||||||
util.LogInfo(c.Ctx, "API: [%s] signed in", userId)
|
util.LogInfo(c.Ctx, "API: [%s] signed in", userId)
|
||||||
c.ResponseOk(userId)
|
|
||||||
|
application := object.GetApplicationByUser(user)
|
||||||
|
var form RequestForm
|
||||||
|
form.Type = responseType
|
||||||
|
resp := c.HandleLoggedIn(application, user, &form)
|
||||||
|
c.Data["json"] = resp
|
||||||
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,7 @@ package controllers
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/astaxie/beego/utils/pagination"
|
"github.com/beego/beego/utils/pagination"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
|
11
go.mod
11
go.mod
@ -4,18 +4,20 @@ go 1.16
|
|||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/RobotsAndPencils/go-saml v0.0.0-20170520135329-fb13cb52a46b
|
github.com/RobotsAndPencils/go-saml v0.0.0-20170520135329-fb13cb52a46b
|
||||||
|
github.com/Unknwon/goconfig v1.0.0
|
||||||
github.com/alexedwards/argon2id v0.0.0-20211130144151-3585854a6387
|
github.com/alexedwards/argon2id v0.0.0-20211130144151-3585854a6387
|
||||||
github.com/astaxie/beego v1.12.3
|
|
||||||
github.com/aws/aws-sdk-go v1.44.4
|
github.com/aws/aws-sdk-go v1.44.4
|
||||||
|
github.com/beego/beego v1.12.11
|
||||||
github.com/beevik/etree v1.1.0
|
github.com/beevik/etree v1.1.0
|
||||||
github.com/casbin/casbin/v2 v2.30.1
|
github.com/casbin/casbin/v2 v2.30.1
|
||||||
github.com/casbin/xorm-adapter/v2 v2.5.1
|
github.com/casbin/xorm-adapter/v3 v3.0.1
|
||||||
github.com/casdoor/go-sms-sender v0.3.0
|
github.com/casdoor/go-sms-sender v0.5.1
|
||||||
github.com/casdoor/goth v1.69.0-FIX2
|
github.com/casdoor/goth v1.69.0-FIX2
|
||||||
github.com/casdoor/oss v1.2.0
|
github.com/casdoor/oss v1.2.0
|
||||||
github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f
|
github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f
|
||||||
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc
|
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc
|
||||||
github.com/duo-labs/webauthn v0.0.0-20211221191814-a22482edaa3b
|
github.com/duo-labs/webauthn v0.0.0-20211221191814-a22482edaa3b
|
||||||
|
github.com/forestmgy/ldapserver v1.1.0
|
||||||
github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df
|
github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df
|
||||||
github.com/go-ldap/ldap/v3 v3.3.0
|
github.com/go-ldap/ldap/v3 v3.3.0
|
||||||
github.com/go-pay/gopay v1.5.72
|
github.com/go-pay/gopay v1.5.72
|
||||||
@ -26,6 +28,7 @@ require (
|
|||||||
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
|
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
|
||||||
github.com/lestrrat-go/jwx v0.9.0
|
github.com/lestrrat-go/jwx v0.9.0
|
||||||
github.com/lib/pq v1.8.0
|
github.com/lib/pq v1.8.0
|
||||||
|
github.com/lor00x/goldap v0.0.0-20180618054307-a546dffdd1a3
|
||||||
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
|
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
|
||||||
github.com/qiangmzsx/string-adapter/v2 v2.1.0
|
github.com/qiangmzsx/string-adapter/v2 v2.1.0
|
||||||
github.com/robfig/cron/v3 v3.0.1
|
github.com/robfig/cron/v3 v3.0.1
|
||||||
@ -45,7 +48,7 @@ require (
|
|||||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
|
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
|
||||||
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
|
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
|
||||||
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
|
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
|
||||||
gopkg.in/ini.v1 v1.62.0 // indirect
|
gopkg.in/ini.v1 v1.67.0
|
||||||
gopkg.in/square/go-jose.v2 v2.6.0
|
gopkg.in/square/go-jose.v2 v2.6.0
|
||||||
gopkg.in/yaml.v2 v2.3.0 // indirect
|
gopkg.in/yaml.v2 v2.3.0 // indirect
|
||||||
xorm.io/core v0.7.2
|
xorm.io/core v0.7.2
|
||||||
|
50
go.sum
50
go.sum
@ -61,6 +61,8 @@ github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go
|
|||||||
github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
|
github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
|
||||||
github.com/RobotsAndPencils/go-saml v0.0.0-20170520135329-fb13cb52a46b h1:EgJ6N2S0h1WfFIjU5/VVHWbMSVYXAluop97Qxpr/lfQ=
|
github.com/RobotsAndPencils/go-saml v0.0.0-20170520135329-fb13cb52a46b h1:EgJ6N2S0h1WfFIjU5/VVHWbMSVYXAluop97Qxpr/lfQ=
|
||||||
github.com/RobotsAndPencils/go-saml v0.0.0-20170520135329-fb13cb52a46b/go.mod h1:3SAoF0F5EbcOuBD5WT9nYkbIJieBS84cUQXADbXeBsU=
|
github.com/RobotsAndPencils/go-saml v0.0.0-20170520135329-fb13cb52a46b/go.mod h1:3SAoF0F5EbcOuBD5WT9nYkbIJieBS84cUQXADbXeBsU=
|
||||||
|
github.com/Unknwon/goconfig v1.0.0 h1:9IAu/BYbSLQi8puFjUQApZTxIHqSwrj5d8vpP8vTq4A=
|
||||||
|
github.com/Unknwon/goconfig v1.0.0/go.mod h1:wngxua9XCNjvHjDiTiV26DaKDT+0c63QR6H5hjVUUxw=
|
||||||
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
||||||
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
||||||
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
||||||
@ -74,13 +76,13 @@ github.com/aliyun/alibaba-cloud-sdk-go v1.61.1075/go.mod h1:pUKYbK5JQ+1Dfxk80P0q
|
|||||||
github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible h1:9gWa46nstkJ9miBReJcN8Gq34cBFbzSpQZVVT9N09TM=
|
github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible h1:9gWa46nstkJ9miBReJcN8Gq34cBFbzSpQZVVT9N09TM=
|
||||||
github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
|
github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
|
||||||
github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
|
github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
|
||||||
github.com/astaxie/beego v1.12.3 h1:SAQkdD2ePye+v8Gn1r4X6IKZM1wd28EyUOVQ3PDSOOQ=
|
|
||||||
github.com/astaxie/beego v1.12.3/go.mod h1:p3qIm0Ryx7zeBHLljmd7omloyca1s4yu1a8kM1FkpIA=
|
|
||||||
github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
|
github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
|
||||||
github.com/aws/aws-sdk-go v1.44.4 h1:ePN0CVJMdiz2vYUcJH96eyxRrtKGSDMgyhP6rah2OgE=
|
github.com/aws/aws-sdk-go v1.44.4 h1:ePN0CVJMdiz2vYUcJH96eyxRrtKGSDMgyhP6rah2OgE=
|
||||||
github.com/aws/aws-sdk-go v1.44.4/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
|
github.com/aws/aws-sdk-go v1.44.4/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
|
||||||
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f h1:ZNv7On9kyUzm7fvRZumSyy/IUiSC7AzL0I1jKKtwooA=
|
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f h1:ZNv7On9kyUzm7fvRZumSyy/IUiSC7AzL0I1jKKtwooA=
|
||||||
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
|
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
|
||||||
|
github.com/beego/beego v1.12.11 h1:MWKcnpavb7iAIS0m6uuEq6pHKkYvGNw/5umIUKqL7jM=
|
||||||
|
github.com/beego/beego v1.12.11/go.mod h1:QURFL1HldOcCZAxnc1cZ7wrplsYR5dKPHFjmk6WkLAs=
|
||||||
github.com/beego/goyaml2 v0.0.0-20130207012346-5545475820dd/go.mod h1:1b+Y/CofkYwXMUU0OhQqGvsY2Bvgr4j6jfT699wyZKQ=
|
github.com/beego/goyaml2 v0.0.0-20130207012346-5545475820dd/go.mod h1:1b+Y/CofkYwXMUU0OhQqGvsY2Bvgr4j6jfT699wyZKQ=
|
||||||
github.com/beego/x2j v0.0.0-20131220205130-a0352aadc542/go.mod h1:kSeGC/p1AbBiEp5kat81+DSQrZenVBZXklMLaELspWU=
|
github.com/beego/x2j v0.0.0-20131220205130-a0352aadc542/go.mod h1:kSeGC/p1AbBiEp5kat81+DSQrZenVBZXklMLaELspWU=
|
||||||
github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs=
|
github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs=
|
||||||
@ -96,10 +98,10 @@ github.com/casbin/casbin/v2 v2.1.0/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n
|
|||||||
github.com/casbin/casbin/v2 v2.28.3/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
|
github.com/casbin/casbin/v2 v2.28.3/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
|
||||||
github.com/casbin/casbin/v2 v2.30.1 h1:P5HWadDL7olwUXNdcuKUBk+x75Y2eitFxYTcLNKeKF0=
|
github.com/casbin/casbin/v2 v2.30.1 h1:P5HWadDL7olwUXNdcuKUBk+x75Y2eitFxYTcLNKeKF0=
|
||||||
github.com/casbin/casbin/v2 v2.30.1/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
|
github.com/casbin/casbin/v2 v2.30.1/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
|
||||||
github.com/casbin/xorm-adapter/v2 v2.5.1 h1:BkpIxRHKa0s3bSMx173PpuU7oTs+Zw7XmD0BIta0HGM=
|
github.com/casbin/xorm-adapter/v3 v3.0.1 h1:0l0zkYxo6cNuIdrBZgFxlje1TRvmheYa/zIp+sGPK58=
|
||||||
github.com/casbin/xorm-adapter/v2 v2.5.1/go.mod h1:AeH4dBKHC9/zYxzdPVHhPDzF8LYLqjDdb767CWJoV54=
|
github.com/casbin/xorm-adapter/v3 v3.0.1/go.mod h1:1BL7rHEDXrxO+vQdSo/ZaWKRivXl7YTos67GdMYcd20=
|
||||||
github.com/casdoor/go-sms-sender v0.3.0 h1:c4bWVcKZhO2L3Xu1oy7aeVkCK6HRJkW/b5K1xU9mV60=
|
github.com/casdoor/go-sms-sender v0.5.1 h1:1/Wp1OLkVAVY4lEGQhekSNetSAWhnPcxYPV7xpCZgC0=
|
||||||
github.com/casdoor/go-sms-sender v0.3.0/go.mod h1:fsZsNnALvFIo+HFcE1U/oCQv4ZT42FdglXKMsEm3WSk=
|
github.com/casdoor/go-sms-sender v0.5.1/go.mod h1:kBykbqwgRDXbXdMAIxmZKinVM1WjdqEbej5LAbUbcfI=
|
||||||
github.com/casdoor/goth v1.69.0-FIX2 h1:RgfIMkL9kekylgxHHK2ZY8ASAwOGns2HVlaBwLu7Bcs=
|
github.com/casdoor/goth v1.69.0-FIX2 h1:RgfIMkL9kekylgxHHK2ZY8ASAwOGns2HVlaBwLu7Bcs=
|
||||||
github.com/casdoor/goth v1.69.0-FIX2/go.mod h1:Om55nRo8CkeDkPSNBbzXW4G5uI28ZUkSk5S69dPek3s=
|
github.com/casdoor/goth v1.69.0-FIX2/go.mod h1:Om55nRo8CkeDkPSNBbzXW4G5uI28ZUkSk5S69dPek3s=
|
||||||
github.com/casdoor/oss v1.2.0 h1:ozLAE+nnNdFQBWbzH8U9spzaO8h8NrB57lBcdyMUUQ8=
|
github.com/casdoor/oss v1.2.0 h1:ozLAE+nnNdFQBWbzH8U9spzaO8h8NrB57lBcdyMUUQ8=
|
||||||
@ -115,9 +117,9 @@ github.com/cloudflare/cfssl v0.0.0-20190726000631-633726f6bcb7 h1:Puu1hUwfps3+1C
|
|||||||
github.com/cloudflare/cfssl v0.0.0-20190726000631-633726f6bcb7/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=
|
github.com/cloudflare/cfssl v0.0.0-20190726000631-633726f6bcb7/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=
|
||||||
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
|
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
|
||||||
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
|
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
|
||||||
github.com/couchbase/go-couchbase v0.0.0-20200519150804-63f3cdb75e0d/go.mod h1:TWI8EKQMs5u5jLKW/tsb9VwauIrMIxQG1r5fMsswK5U=
|
github.com/couchbase/go-couchbase v0.0.0-20201216133707-c04035124b17/go.mod h1:+/bddYDxXsf9qt0xpDUtRR47A2GjaXmGGAqQ/k3GJ8A=
|
||||||
github.com/couchbase/gomemcached v0.0.0-20200526233749-ec430f949808/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c=
|
github.com/couchbase/gomemcached v0.1.2-0.20201224031647-c432ccf49f32/go.mod h1:mxliKQxOv84gQ0bJWbI+w9Wxdpt9HjDvgW9MjCym5Vo=
|
||||||
github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
|
github.com/couchbase/goutils v0.0.0-20210118111533-e33d3ffb5401/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
|
||||||
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
||||||
github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGiisLwp9rITslkFNpZD5rz43tf41QFkTWY=
|
github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGiisLwp9rITslkFNpZD5rz43tf41QFkTWY=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
@ -137,6 +139,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
|
|||||||
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||||
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
|
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
|
||||||
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
||||||
|
github.com/forestmgy/ldapserver v1.1.0 h1:gvil4nuLhqPEL8SugCkFhRyA0/lIvRdwZSqlrw63ll4=
|
||||||
|
github.com/forestmgy/ldapserver v1.1.0/go.mod h1:1RZ8lox1QSY7rmbjdmy+sYQXY4Lp7SpGzpdE3+j3IyM=
|
||||||
github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk=
|
github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk=
|
||||||
github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
|
github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
|
||||||
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
||||||
@ -173,6 +177,8 @@ github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB
|
|||||||
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
||||||
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
||||||
github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
|
github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
|
||||||
|
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
|
||||||
|
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
|
||||||
github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
|
github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
|
||||||
github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8eU=
|
github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8eU=
|
||||||
github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
|
github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
|
||||||
@ -188,8 +194,9 @@ github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFU
|
|||||||
github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
|
github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
|
||||||
github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
|
github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
|
||||||
github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
|
github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
|
||||||
github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
|
|
||||||
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
|
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
|
||||||
|
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
|
||||||
|
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
|
||||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||||
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||||
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||||
@ -300,6 +307,8 @@ github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
|
|||||||
github.com/lib/pq v1.7.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
github.com/lib/pq v1.7.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
||||||
github.com/lib/pq v1.8.0 h1:9xohqzkUwzR4Ga4ivdTcawVS89YSDVxXMa3xJX3cGzg=
|
github.com/lib/pq v1.8.0 h1:9xohqzkUwzR4Ga4ivdTcawVS89YSDVxXMa3xJX3cGzg=
|
||||||
github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
||||||
|
github.com/lor00x/goldap v0.0.0-20180618054307-a546dffdd1a3 h1:wIONC+HMNRqmWBjuMxhatuSzHaljStc4gjDeKycxy0A=
|
||||||
|
github.com/lor00x/goldap v0.0.0-20180618054307-a546dffdd1a3/go.mod h1:37YR9jabpiIxsb8X9VCIx8qFOjTDIIrIHHODa8C4gz0=
|
||||||
github.com/markbates/going v1.0.0 h1:DQw0ZP7NbNlFGcKbcE/IVSOAFzScxRtLpd0rLMzLhq0=
|
github.com/markbates/going v1.0.0 h1:DQw0ZP7NbNlFGcKbcE/IVSOAFzScxRtLpd0rLMzLhq0=
|
||||||
github.com/markbates/going v1.0.0/go.mod h1:I6mnB4BPnEeqo85ynXIx1ZFLLbtiLHNXVgWeFO9OGOA=
|
github.com/markbates/going v1.0.0/go.mod h1:I6mnB4BPnEeqo85ynXIx1ZFLLbtiLHNXVgWeFO9OGOA=
|
||||||
github.com/mattermost/xml-roundtrip-validator v0.0.0-20201208211235-fe770d50d911 h1:erppMjjp69Rertg1zlgRbLJH1u+eCmRPxKjMZ5I8/Ro=
|
github.com/mattermost/xml-roundtrip-validator v0.0.0-20201208211235-fe770d50d911 h1:erppMjjp69Rertg1zlgRbLJH1u+eCmRPxKjMZ5I8/Ro=
|
||||||
@ -334,7 +343,6 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
|
|||||||
github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ=
|
github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ=
|
||||||
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
|
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
|
||||||
github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
|
github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
|
||||||
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
|
|
||||||
github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
|
github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
|
||||||
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
|
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
|
||||||
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||||
@ -400,11 +408,11 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
|
|||||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||||
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
||||||
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
|
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
|
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
|
||||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||||
github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
|
github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
|
||||||
github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
|
|
||||||
github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
|
github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
|
||||||
github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
|
github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
|
||||||
github.com/tealeg/xlsx v1.0.5 h1:+f8oFmvY8Gw1iUXzPk+kz+4GpbDZPK1FhPiQRd+ypgE=
|
github.com/tealeg/xlsx v1.0.5 h1:+f8oFmvY8Gw1iUXzPk+kz+4GpbDZPK1FhPiQRd+ypgE=
|
||||||
@ -417,16 +425,19 @@ github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03O
|
|||||||
github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
|
github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
|
||||||
github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
|
github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
|
||||||
github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
|
github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
|
||||||
|
github.com/twilio/twilio-go v0.26.0 h1:wFW4oTe3/LKt6bvByP7eio8JsjtaLHjMQKOUEzQry7U=
|
||||||
|
github.com/twilio/twilio-go v0.26.0/go.mod h1:lz62Hopu4vicpQ056H5TJ0JE4AP0rS3sQ35/ejmgOwE=
|
||||||
github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
|
github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
|
||||||
github.com/volcengine/volc-sdk-golang v1.0.19 h1:jJp+aJgK0e//rZ9I0K2Y7ufJwvuZRo/AQsYDynXMNgA=
|
github.com/volcengine/volc-sdk-golang v1.0.19 h1:jJp+aJgK0e//rZ9I0K2Y7ufJwvuZRo/AQsYDynXMNgA=
|
||||||
github.com/volcengine/volc-sdk-golang v1.0.19/go.mod h1:+GGi447k4p1I5PNdbpG2GLaF0Ui9vIInTojMM0IfSS4=
|
github.com/volcengine/volc-sdk-golang v1.0.19/go.mod h1:+GGi447k4p1I5PNdbpG2GLaF0Ui9vIInTojMM0IfSS4=
|
||||||
github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
|
github.com/wendal/errors v0.0.0-20181209125328-7f31f4b264ec/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
|
||||||
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
|
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
|
||||||
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
|
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
|
||||||
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
|
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
|
||||||
github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU=
|
github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU=
|
||||||
github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
|
github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
|
||||||
github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
|
github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
|
||||||
@ -447,6 +458,7 @@ golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPh
|
|||||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||||
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||||
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||||
|
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
|
||||||
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||||
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
@ -482,6 +494,7 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
|
|||||||
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
||||||
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
|
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
@ -516,6 +529,7 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R
|
|||||||
golang.org/x/net v0.0.0-20200927032502-5d4f70055728/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
golang.org/x/net v0.0.0-20200927032502-5d4f70055728/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||||
golang.org/x/net v0.0.0-20200930145003-4acb6c075d10/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
golang.org/x/net v0.0.0-20200930145003-4acb6c075d10/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
||||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||||
|
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
|
||||||
golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
|
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
|
||||||
@ -537,6 +551,7 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
|
|||||||
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
@ -552,6 +567,7 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7w
|
|||||||
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
@ -573,7 +589,9 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w
|
|||||||
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20211020174200-9d6173849985/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20211020174200-9d6173849985/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
@ -581,6 +599,7 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
|
|||||||
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
|
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
|
||||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||||
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
@ -639,6 +658,7 @@ golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc
|
|||||||
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
|
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
|
||||||
golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
|
golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
|
||||||
golang.org/x/tools v0.0.0-20200929161345-d7fc70abf50f/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
|
golang.org/x/tools v0.0.0-20200929161345-d7fc70abf50f/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
|
||||||
|
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
||||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
@ -739,8 +759,8 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy
|
|||||||
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
|
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
|
||||||
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
|
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
|
||||||
gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
|
gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
|
||||||
gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
|
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
|
||||||
gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
|
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
|
||||||
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
|
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
|
||||||
gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI=
|
gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI=
|
||||||
gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
|
gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
|
||||||
|
122
i18n/generate_backend.go
Normal file
122
i18n/generate_backend.go
Normal file
@ -0,0 +1,122 @@
|
|||||||
|
// Copyright 2022 The Casdoor Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// 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.
|
||||||
|
|
||||||
|
package i18n
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/Unknwon/goconfig"
|
||||||
|
"github.com/casdoor/casdoor/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
reI18nBackendObject *regexp.Regexp
|
||||||
|
re18nBackendController *regexp.Regexp
|
||||||
|
)
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
reI18nBackendObject, _ = regexp.Compile("i18n.Translate\\((.*?)\"\\)")
|
||||||
|
re18nBackendController, _ = regexp.Compile("c.T\\((.*?)\"\\)")
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetAllI18nStrings(fileContent string, path string) []string {
|
||||||
|
res := []string{}
|
||||||
|
if strings.Contains(path, "object") {
|
||||||
|
matches := reI18nBackendObject.FindAllStringSubmatch(fileContent, -1)
|
||||||
|
if matches == nil {
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
for _, match := range matches {
|
||||||
|
match := strings.Split(match[1], ",")
|
||||||
|
res = append(res, match[1][2:])
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
matches := re18nBackendController.FindAllStringSubmatch(fileContent, -1)
|
||||||
|
if matches == nil {
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
for _, match := range matches {
|
||||||
|
res = append(res, match[1][1:])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
|
||||||
|
func getAllGoFilePaths() []string {
|
||||||
|
path := "../"
|
||||||
|
|
||||||
|
res := []string{}
|
||||||
|
err := filepath.Walk(path,
|
||||||
|
func(path string, info os.FileInfo, err error) error {
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if !strings.HasSuffix(info.Name(), ".go") {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
res = append(res, path)
|
||||||
|
// fmt.Println(path, info.Name())
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
|
||||||
|
func getErrName(paths []string) map[string]bool {
|
||||||
|
ErrName := make(map[string]bool)
|
||||||
|
for i := 0; i < len(paths); i++ {
|
||||||
|
content := util.ReadStringFromPath(paths[i])
|
||||||
|
words := GetAllI18nStrings(content, paths[i])
|
||||||
|
for i := 0; i < len(words); i++ {
|
||||||
|
ErrName[words[i]] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ErrName
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeToAllLanguageFiles(errName map[string]bool) {
|
||||||
|
languages := "en,zh,es,fr,de,ja,ko,ru"
|
||||||
|
languageArr := strings.Split(languages, ",")
|
||||||
|
var c [10]*goconfig.ConfigFile
|
||||||
|
for i := 0; i < len(languageArr); i++ {
|
||||||
|
var err error
|
||||||
|
c[i], err = goconfig.LoadConfigFile("../i18n/languages/" + "locale_" + languageArr[i] + ".ini")
|
||||||
|
if err != nil {
|
||||||
|
log.Println(err.Error())
|
||||||
|
}
|
||||||
|
for j := range errName {
|
||||||
|
parts := strings.Split(j, ".")
|
||||||
|
_, err := c[i].GetValue(parts[0], parts[1])
|
||||||
|
if err != nil {
|
||||||
|
c[i].SetValue(parts[0], parts[1], parts[1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
c[i].SetPrettyFormat(true)
|
||||||
|
err = goconfig.SaveConfigFile(c[i], "../i18n/languages/"+"locale_"+languageArr[i]+".ini")
|
||||||
|
if err != nil {
|
||||||
|
log.Println(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -14,7 +14,10 @@
|
|||||||
|
|
||||||
package i18n
|
package i18n
|
||||||
|
|
||||||
import "testing"
|
import (
|
||||||
|
"fmt"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
func applyToOtherLanguage(dataEn *I18nData, lang string) {
|
func applyToOtherLanguage(dataEn *I18nData, lang string) {
|
||||||
dataOther := readI18nFile(lang)
|
dataOther := readI18nFile(lang)
|
||||||
@ -24,7 +27,7 @@ func applyToOtherLanguage(dataEn *I18nData, lang string) {
|
|||||||
writeI18nFile(lang, dataEn)
|
writeI18nFile(lang, dataEn)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestGenerateI18nStrings(t *testing.T) {
|
func TestGenerateI18nStringsForFrontend(t *testing.T) {
|
||||||
dataEn := parseToData()
|
dataEn := parseToData()
|
||||||
writeI18nFile("en", dataEn)
|
writeI18nFile("en", dataEn)
|
||||||
|
|
||||||
@ -35,3 +38,17 @@ func TestGenerateI18nStrings(t *testing.T) {
|
|||||||
applyToOtherLanguage(dataEn, "ru")
|
applyToOtherLanguage(dataEn, "ru")
|
||||||
applyToOtherLanguage(dataEn, "zh")
|
applyToOtherLanguage(dataEn, "zh")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGenerateI18nStringsForBackend(t *testing.T) {
|
||||||
|
paths := getAllGoFilePaths()
|
||||||
|
|
||||||
|
errName := getErrName(paths)
|
||||||
|
|
||||||
|
writeToAllLanguageFiles(errName)
|
||||||
|
|
||||||
|
fmt.Println("Total Err Words:", len(errName))
|
||||||
|
|
||||||
|
for i := range errName {
|
||||||
|
fmt.Println(i)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
137
i18n/languages/locale_de.ini
Normal file
137
i18n/languages/locale_de.ini
Normal file
@ -0,0 +1,137 @@
|
|||||||
|
[ApplicationErr]
|
||||||
|
AppNotFound = Application %s not found
|
||||||
|
AppNotFoundForUserID = No application is found for userId: %s
|
||||||
|
GrantTypeNotSupport = Grant_type: %s is not supported in this application
|
||||||
|
HasNoProviders = This application has no providers
|
||||||
|
HasNoProvidersOfType = This application has no providers of type
|
||||||
|
InvalidID = Invalid application id
|
||||||
|
|
||||||
|
[AuthErr]
|
||||||
|
AuthStateWrong = State expected: %s, but got: %s
|
||||||
|
ChallengeMethodErr = Challenge method should be S256
|
||||||
|
CanNotUnlinkUsers = You are not the global admin, you can't unlink other users
|
||||||
|
CanNotLinkMySelf = You can't unlink yourself, you are not a member of any application
|
||||||
|
CallWebAuthnSigninBegin = Please call WebAuthnSigninBegin first
|
||||||
|
NotHuman = Turing test failed.
|
||||||
|
Unauthorized = Unauthorized operation
|
||||||
|
WrongPasswordManyTimes = WrongPasswordManyTimes
|
||||||
|
|
||||||
|
[CasErr]
|
||||||
|
ServiceDoNotMatch = Service %s and %s do not match
|
||||||
|
|
||||||
|
[EmailErr]
|
||||||
|
ExistedErr = Email already exists
|
||||||
|
EmptyErr = Email cannot be empty
|
||||||
|
EmailInvalid = Email is invalid
|
||||||
|
EmailCheckResult = Email: %s
|
||||||
|
EmptyParam = Empty parameters for emailForm: %v
|
||||||
|
InvalidReceivers = Invalid Email receivers: %s
|
||||||
|
UnableGetModifyRule = Unable to get the email modify rule.
|
||||||
|
|
||||||
|
[EnforcerErr]
|
||||||
|
SignInFirst = Please sign in first
|
||||||
|
|
||||||
|
[InitErr]
|
||||||
|
InitScoreFailed = Get init score failed, error: %%w
|
||||||
|
|
||||||
|
[LdapErr]
|
||||||
|
MultipleAccounts = Multiple accounts with same uid, please check your ldap server
|
||||||
|
PasswordWrong = Ldap user name or password incorrect
|
||||||
|
ServerExisted = Ldap server exist
|
||||||
|
|
||||||
|
[LoginErr]
|
||||||
|
AppDoNotExist = The application: %s does not exist
|
||||||
|
AppNotEnableSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support
|
||||||
|
AccountDoNotExist = The account does not exist
|
||||||
|
InvalidUserInformation = Failed to create user, user information is invalid: %s
|
||||||
|
LoginFirst = Please login first
|
||||||
|
LoginFail = Failed to login in: %s
|
||||||
|
NoPermission = You don't have the permission to do this
|
||||||
|
OldUser = The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)
|
||||||
|
ProviderCanNotSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up
|
||||||
|
SessionOutdated = Session outdated, please login again
|
||||||
|
SignOutFirst = Please sign out first before signing in
|
||||||
|
UserDoNotExist = The user: %s/%s doesn't exist
|
||||||
|
UserIsForbidden = The user is forbidden to sign in, please contact the administrator
|
||||||
|
UnknownAuthentication = Unknown authentication type (not password or provider), form = %s
|
||||||
|
UnsupportedPasswordType = unsupported password type: %s
|
||||||
|
|
||||||
|
[OrgErr]
|
||||||
|
DoNotExist = Organization does not exist
|
||||||
|
Immutable = The %s is immutable.
|
||||||
|
OnlyAdmin = Only admin can modify the %s.
|
||||||
|
UnknownModifyRule = Unknown modify rule %s.
|
||||||
|
|
||||||
|
[ParameterErr]
|
||||||
|
OrgMissingErr = Parameter organization is missing
|
||||||
|
Missing = Missing parameter
|
||||||
|
UnknownType = Unknown type
|
||||||
|
Wrong = Wrong parameter
|
||||||
|
|
||||||
|
[PhoneErr]
|
||||||
|
CodeNotSent = Code has not been sent yet!
|
||||||
|
CodeTimeOut = You should verify your code in %d min!
|
||||||
|
ExistedErr = Phone already exists
|
||||||
|
EmptyErr = Phone cannot be empty
|
||||||
|
InvalidReceivers = Invalid phone receivers: %s
|
||||||
|
NumberInvalid = Phone number is invalid
|
||||||
|
NoPrefix = %s No phone prefix
|
||||||
|
PhoneCheckResult = Phone: %s
|
||||||
|
UnableGetModifyRule = Unable to get the phone modify rule.
|
||||||
|
|
||||||
|
[ProviderErr]
|
||||||
|
CanNotBeUnlinked = This provider can't be unlinked
|
||||||
|
CategoryNotSAML = provider %s's category is not SAML
|
||||||
|
DoNotExist = the provider: %s does not exist
|
||||||
|
InvalidProvider = Invalid captcha provider.
|
||||||
|
LinkFirstErr = Please link first
|
||||||
|
ProviderNotEnabled = The provider: %s is not enabled for the application
|
||||||
|
ProviderNotSupported = The provider type: %s is not supported
|
||||||
|
ProviderNotFound = The provider: %s is not found
|
||||||
|
ProviderNotFoundForCategory = No provider for category: %s is found for application: %s
|
||||||
|
|
||||||
|
[ResourceErr]
|
||||||
|
NotAuthorized = You are not authorized to access this resource
|
||||||
|
UserIsNil = User is nil for tag: /"avatar/"
|
||||||
|
UsernameOrFilePathEmpty = Username or fullFilePath is empty: username = %s, fullFilePath = %s
|
||||||
|
|
||||||
|
[SetPasswordErr]
|
||||||
|
CanNotContainBlank = New password cannot contain blank space.
|
||||||
|
LessThanSixCharacters = New password must have at least 6 characters
|
||||||
|
|
||||||
|
[SignUpErr]
|
||||||
|
DoNotAllowSignUp = The application does not allow to sign up new account
|
||||||
|
SignOutFirst = Please sign out first before signing up
|
||||||
|
|
||||||
|
[StorageErr]
|
||||||
|
ObjectKeyNotAllowed = The objectKey: %s is not allowed
|
||||||
|
|
||||||
|
[TokenErr]
|
||||||
|
EmptyClientID = Empty clientId or clientSecret
|
||||||
|
InvalidToken = Invalid token
|
||||||
|
InvalidAppOrWrongClientSecret = Invalid application or wrong clientSecret
|
||||||
|
InvalidClientId = Invalid client_id
|
||||||
|
RedirectURIDoNotExist = Redirect URI: %s doesn't exist in the allowed Redirect URI list
|
||||||
|
|
||||||
|
[UserErr]
|
||||||
|
AffiliationBlankErr = Affiliation cannot be blank
|
||||||
|
DisplayNameBlankErr = DisplayName cannot be blank
|
||||||
|
DisplayNameInvalid = DisplayName is not valid real name
|
||||||
|
DisplayNameCanNotBeEmpty = Display name cannot be empty
|
||||||
|
DoNotExist = The user: %s doesn't exist
|
||||||
|
DoNotExistInOrg = The user: %s/%s doesn't exist
|
||||||
|
DoNotExistSignUp = the user does not exist, please sign up first
|
||||||
|
FirstNameBlankErr = FirstName cannot be blank
|
||||||
|
FailToImportUsers = Failed to import users
|
||||||
|
LastNameBlankErr = LastName cannot be blank
|
||||||
|
NameLessThanTwoCharacters = Username must have at least 2 characters
|
||||||
|
NameStartWithADigitErr = Username cannot start with a digit
|
||||||
|
NameIsEmailErr = Username cannot be an email address
|
||||||
|
NameCantainWhitSpaceErr = Username cannot contain white spaces
|
||||||
|
NameExistedErr = Username already exists
|
||||||
|
NameEmptyErr = Empty username.
|
||||||
|
NameTooLang = Username is too long (maximum is 39 characters).
|
||||||
|
NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
|
||||||
|
PasswordLessThanSixCharacters = Password must have at least 6 characters
|
||||||
|
InvalidInformation = Invalid information
|
||||||
|
|
137
i18n/languages/locale_en.ini
Normal file
137
i18n/languages/locale_en.ini
Normal file
@ -0,0 +1,137 @@
|
|||||||
|
[ApplicationErr]
|
||||||
|
AppNotFound = Application %s not found
|
||||||
|
AppNotFoundForUserID = No application is found for userId: %s
|
||||||
|
GrantTypeNotSupport = Grant_type: %s is not supported in this application
|
||||||
|
HasNoProviders = This application has no providers
|
||||||
|
HasNoProvidersOfType = This application has no providers of type
|
||||||
|
InvalidID = Invalid application id
|
||||||
|
|
||||||
|
[AuthErr]
|
||||||
|
AuthStateWrong = State expected: %s, but got: %s
|
||||||
|
ChallengeMethodErr = Challenge method should be S256
|
||||||
|
CanNotUnlinkUsers = You are not the global admin, you can't unlink other users
|
||||||
|
CanNotLinkMySelf = You can't unlink yourself, you are not a member of any application
|
||||||
|
CallWebAuthnSigninBegin = Please call WebAuthnSigninBegin first
|
||||||
|
NotHuman = Turing test failed.
|
||||||
|
WrongPasswordManyTimes = You have entered the wrong password too many times, please wait for %d minutes %d seconds and try again
|
||||||
|
Unauthorized = Unauthorized operation
|
||||||
|
|
||||||
|
[CasErr]
|
||||||
|
ServiceDoNotMatch = Service %s and %s do not match
|
||||||
|
|
||||||
|
[EmailErr]
|
||||||
|
ExistedErr = Email already exists
|
||||||
|
EmptyErr = Email cannot be empty
|
||||||
|
EmailInvalid = Email is invalid
|
||||||
|
EmailCheckResult = Email: %s
|
||||||
|
EmptyParam = Empty parameters for emailForm: %v
|
||||||
|
InvalidReceivers = Invalid Email receivers: %s
|
||||||
|
UnableGetModifyRule = Unable to get the email modify rule.
|
||||||
|
|
||||||
|
[EnforcerErr]
|
||||||
|
SignInFirst = Please sign in first
|
||||||
|
|
||||||
|
[InitErr]
|
||||||
|
InitScoreFailed = Get init score failed, error: %%w
|
||||||
|
|
||||||
|
[LdapErr]
|
||||||
|
MultipleAccounts = Multiple accounts with same uid, please check your ldap server
|
||||||
|
PasswordWrong = Ldap user name or password incorrect
|
||||||
|
ServerExisted = Ldap server exist
|
||||||
|
|
||||||
|
[LoginErr]
|
||||||
|
AppDoNotExist = The application: %s does not exist
|
||||||
|
AppNotEnableSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support
|
||||||
|
AccountDoNotExist = The account does not exist
|
||||||
|
InvalidUserInformation = Failed to create user, user information is invalid: %s
|
||||||
|
LoginFirst = Please login first
|
||||||
|
LoginFail = Failed to login in: %s
|
||||||
|
NoPermission = You don't have the permission to do this
|
||||||
|
OldUser = The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)
|
||||||
|
ProviderCanNotSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up
|
||||||
|
SessionOutdated = Session outdated, please login again
|
||||||
|
SignOutFirst = Please sign out first before signing in
|
||||||
|
UserDoNotExist = The user: %s/%s doesn't exist
|
||||||
|
UserIsForbidden = The user is forbidden to sign in, please contact the administrator
|
||||||
|
UnknownAuthentication = Unknown authentication type (not password or provider), form = %s
|
||||||
|
UnsupportedPasswordType = unsupported password type: %s
|
||||||
|
|
||||||
|
[OrgErr]
|
||||||
|
DoNotExist = Organization does not exist
|
||||||
|
Immutable = The %s is immutable.
|
||||||
|
OnlyAdmin = Only admin can modify the %s.
|
||||||
|
UnknownModifyRule = Unknown modify rule %s.
|
||||||
|
|
||||||
|
[ParameterErr]
|
||||||
|
OrgMissingErr = Parameter organization is missing
|
||||||
|
Missing = Missing parameter
|
||||||
|
UnknownType = Unknown type
|
||||||
|
Wrong = Wrong parameter
|
||||||
|
|
||||||
|
[PhoneErr]
|
||||||
|
CodeNotSent = Code has not been sent yet!
|
||||||
|
CodeTimeOut = You should verify your code in %d min!
|
||||||
|
ExistedErr = Phone already exists
|
||||||
|
EmptyErr = Phone cannot be empty
|
||||||
|
InvalidReceivers = Invalid phone receivers: %s
|
||||||
|
NumberInvalid = Phone number is invalid
|
||||||
|
NoPrefix = %s No phone prefix
|
||||||
|
PhoneCheckResult = Phone: %s
|
||||||
|
UnableGetModifyRule = Unable to get the phone modify rule.
|
||||||
|
|
||||||
|
[ProviderErr]
|
||||||
|
CanNotBeUnlinked = This provider can't be unlinked
|
||||||
|
CategoryNotSAML = provider %s's category is not SAML
|
||||||
|
DoNotExist = the provider: %s does not exist
|
||||||
|
InvalidProvider = Invalid captcha provider.
|
||||||
|
LinkFirstErr = Please link first
|
||||||
|
ProviderNotEnabled = The provider: %s is not enabled for the application
|
||||||
|
ProviderNotSupported = The provider type: %s is not supported
|
||||||
|
ProviderNotFound = The provider: %s is not found
|
||||||
|
ProviderNotFoundForCategory = No provider for category: %s is found for application: %s
|
||||||
|
|
||||||
|
[ResourceErr]
|
||||||
|
NotAuthorized = You are not authorized to access this resource
|
||||||
|
UserIsNil = User is nil for tag: /"avatar/"
|
||||||
|
UsernameOrFilePathEmpty = Username or fullFilePath is empty: username = %s, fullFilePath = %s
|
||||||
|
|
||||||
|
[SetPasswordErr]
|
||||||
|
CanNotContainBlank = New password cannot contain blank space.
|
||||||
|
LessThanSixCharacters = New password must have at least 6 characters
|
||||||
|
|
||||||
|
[SignUpErr]
|
||||||
|
DoNotAllowSignUp = The application does not allow to sign up new account
|
||||||
|
SignOutFirst = Please sign out first before signing up
|
||||||
|
|
||||||
|
[StorageErr]
|
||||||
|
ObjectKeyNotAllowed = The objectKey: %s is not allowed
|
||||||
|
|
||||||
|
[TokenErr]
|
||||||
|
EmptyClientID = Empty clientId or clientSecret
|
||||||
|
InvalidToken = Invalid token
|
||||||
|
InvalidAppOrWrongClientSecret = Invalid application or wrong clientSecret
|
||||||
|
InvalidClientId = Invalid client_id
|
||||||
|
RedirectURIDoNotExist = Redirect URI: %s doesn't exist in the allowed Redirect URI list
|
||||||
|
|
||||||
|
[UserErr]
|
||||||
|
AffiliationBlankErr = Affiliation cannot be blank
|
||||||
|
DisplayNameBlankErr = DisplayName cannot be blank
|
||||||
|
DisplayNameInvalid = DisplayName is not valid real name
|
||||||
|
DisplayNameCanNotBeEmpty = Display name cannot be empty
|
||||||
|
DoNotExist = The user: %s doesn't exist
|
||||||
|
DoNotExistInOrg = The user: %s/%s doesn't exist
|
||||||
|
DoNotExistSignUp = the user does not exist, please sign up first
|
||||||
|
FirstNameBlankErr = FirstName cannot be blank
|
||||||
|
FailToImportUsers = Failed to import users
|
||||||
|
LastNameBlankErr = LastName cannot be blank
|
||||||
|
NameLessThanTwoCharacters = Username must have at least 2 characters
|
||||||
|
NameStartWithADigitErr = Username cannot start with a digit
|
||||||
|
NameIsEmailErr = Username cannot be an email address
|
||||||
|
NameCantainWhitSpaceErr = Username cannot contain white spaces
|
||||||
|
NameExistedErr = Username already exists
|
||||||
|
NameEmptyErr = Empty username.
|
||||||
|
NameTooLang = Username is too long (maximum is 39 characters).
|
||||||
|
NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
|
||||||
|
PasswordLessThanSixCharacters = Password must have at least 6 characters
|
||||||
|
InvalidInformation = Invalid information
|
||||||
|
|
137
i18n/languages/locale_es.ini
Normal file
137
i18n/languages/locale_es.ini
Normal file
@ -0,0 +1,137 @@
|
|||||||
|
[ApplicationErr]
|
||||||
|
AppNotFound = Application %s not found
|
||||||
|
AppNotFoundForUserID = No application is found for userId: %s
|
||||||
|
GrantTypeNotSupport = Grant_type: %s is not supported in this application
|
||||||
|
HasNoProviders = This application has no providers
|
||||||
|
HasNoProvidersOfType = This application has no providers of type
|
||||||
|
InvalidID = Invalid application id
|
||||||
|
|
||||||
|
[AuthErr]
|
||||||
|
AuthStateWrong = State expected: %s, but got: %s
|
||||||
|
ChallengeMethodErr = Challenge method should be S256
|
||||||
|
CanNotUnlinkUsers = You are not the global admin, you can't unlink other users
|
||||||
|
CanNotLinkMySelf = You can't unlink yourself, you are not a member of any application
|
||||||
|
CallWebAuthnSigninBegin = Please call WebAuthnSigninBegin first
|
||||||
|
NotHuman = Turing test failed.
|
||||||
|
Unauthorized = Unauthorized operation
|
||||||
|
WrongPasswordManyTimes = WrongPasswordManyTimes
|
||||||
|
|
||||||
|
[CasErr]
|
||||||
|
ServiceDoNotMatch = Service %s and %s do not match
|
||||||
|
|
||||||
|
[EmailErr]
|
||||||
|
ExistedErr = Email already exists
|
||||||
|
EmptyErr = Email cannot be empty
|
||||||
|
EmailInvalid = Email is invalid
|
||||||
|
EmailCheckResult = Email: %s
|
||||||
|
EmptyParam = Empty parameters for emailForm: %v
|
||||||
|
InvalidReceivers = Invalid Email receivers: %s
|
||||||
|
UnableGetModifyRule = Unable to get the email modify rule.
|
||||||
|
|
||||||
|
[EnforcerErr]
|
||||||
|
SignInFirst = Please sign in first
|
||||||
|
|
||||||
|
[InitErr]
|
||||||
|
InitScoreFailed = Get init score failed, error: %%w
|
||||||
|
|
||||||
|
[LdapErr]
|
||||||
|
MultipleAccounts = Multiple accounts with same uid, please check your ldap server
|
||||||
|
PasswordWrong = Ldap user name or password incorrect
|
||||||
|
ServerExisted = Ldap server exist
|
||||||
|
|
||||||
|
[LoginErr]
|
||||||
|
AppDoNotExist = The application: %s does not exist
|
||||||
|
AppNotEnableSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support
|
||||||
|
AccountDoNotExist = The account does not exist
|
||||||
|
InvalidUserInformation = Failed to create user, user information is invalid: %s
|
||||||
|
LoginFirst = Please login first
|
||||||
|
LoginFail = Failed to login in: %s
|
||||||
|
NoPermission = You don't have the permission to do this
|
||||||
|
OldUser = The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)
|
||||||
|
ProviderCanNotSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up
|
||||||
|
SessionOutdated = Session outdated, please login again
|
||||||
|
SignOutFirst = Please sign out first before signing in
|
||||||
|
UserDoNotExist = The user: %s/%s doesn't exist
|
||||||
|
UserIsForbidden = The user is forbidden to sign in, please contact the administrator
|
||||||
|
UnknownAuthentication = Unknown authentication type (not password or provider), form = %s
|
||||||
|
UnsupportedPasswordType = unsupported password type: %s
|
||||||
|
|
||||||
|
[OrgErr]
|
||||||
|
DoNotExist = Organization does not exist
|
||||||
|
Immutable = The %s is immutable.
|
||||||
|
OnlyAdmin = Only admin can modify the %s.
|
||||||
|
UnknownModifyRule = Unknown modify rule %s.
|
||||||
|
|
||||||
|
[ParameterErr]
|
||||||
|
OrgMissingErr = Parameter organization is missing
|
||||||
|
Missing = Missing parameter
|
||||||
|
UnknownType = Unknown type
|
||||||
|
Wrong = Wrong parameter
|
||||||
|
|
||||||
|
[PhoneErr]
|
||||||
|
CodeNotSent = Code has not been sent yet!
|
||||||
|
CodeTimeOut = You should verify your code in %d min!
|
||||||
|
ExistedErr = Phone already exists
|
||||||
|
EmptyErr = Phone cannot be empty
|
||||||
|
InvalidReceivers = Invalid phone receivers: %s
|
||||||
|
NumberInvalid = Phone number is invalid
|
||||||
|
NoPrefix = %s No phone prefix
|
||||||
|
PhoneCheckResult = Phone: %s
|
||||||
|
UnableGetModifyRule = Unable to get the phone modify rule.
|
||||||
|
|
||||||
|
[ProviderErr]
|
||||||
|
CanNotBeUnlinked = This provider can't be unlinked
|
||||||
|
CategoryNotSAML = provider %s's category is not SAML
|
||||||
|
DoNotExist = the provider: %s does not exist
|
||||||
|
InvalidProvider = Invalid captcha provider.
|
||||||
|
LinkFirstErr = Please link first
|
||||||
|
ProviderNotEnabled = The provider: %s is not enabled for the application
|
||||||
|
ProviderNotSupported = The provider type: %s is not supported
|
||||||
|
ProviderNotFound = The provider: %s is not found
|
||||||
|
ProviderNotFoundForCategory = No provider for category: %s is found for application: %s
|
||||||
|
|
||||||
|
[ResourceErr]
|
||||||
|
NotAuthorized = You are not authorized to access this resource
|
||||||
|
UserIsNil = User is nil for tag: /"avatar/"
|
||||||
|
UsernameOrFilePathEmpty = Username or fullFilePath is empty: username = %s, fullFilePath = %s
|
||||||
|
|
||||||
|
[SetPasswordErr]
|
||||||
|
CanNotContainBlank = New password cannot contain blank space.
|
||||||
|
LessThanSixCharacters = New password must have at least 6 characters
|
||||||
|
|
||||||
|
[SignUpErr]
|
||||||
|
DoNotAllowSignUp = The application does not allow to sign up new account
|
||||||
|
SignOutFirst = Please sign out first before signing up
|
||||||
|
|
||||||
|
[StorageErr]
|
||||||
|
ObjectKeyNotAllowed = The objectKey: %s is not allowed
|
||||||
|
|
||||||
|
[TokenErr]
|
||||||
|
EmptyClientID = Empty clientId or clientSecret
|
||||||
|
InvalidToken = Invalid token
|
||||||
|
InvalidAppOrWrongClientSecret = Invalid application or wrong clientSecret
|
||||||
|
InvalidClientId = Invalid client_id
|
||||||
|
RedirectURIDoNotExist = Redirect URI: %s doesn't exist in the allowed Redirect URI list
|
||||||
|
|
||||||
|
[UserErr]
|
||||||
|
AffiliationBlankErr = Affiliation cannot be blank
|
||||||
|
DisplayNameBlankErr = DisplayName cannot be blank
|
||||||
|
DisplayNameInvalid = DisplayName is not valid real name
|
||||||
|
DisplayNameCanNotBeEmpty = Display name cannot be empty
|
||||||
|
DoNotExist = The user: %s doesn't exist
|
||||||
|
DoNotExistInOrg = The user: %s/%s doesn't exist
|
||||||
|
DoNotExistSignUp = the user does not exist, please sign up first
|
||||||
|
FirstNameBlankErr = FirstName cannot be blank
|
||||||
|
FailToImportUsers = Failed to import users
|
||||||
|
LastNameBlankErr = LastName cannot be blank
|
||||||
|
NameLessThanTwoCharacters = Username must have at least 2 characters
|
||||||
|
NameStartWithADigitErr = Username cannot start with a digit
|
||||||
|
NameIsEmailErr = Username cannot be an email address
|
||||||
|
NameCantainWhitSpaceErr = Username cannot contain white spaces
|
||||||
|
NameExistedErr = Username already exists
|
||||||
|
NameEmptyErr = Empty username.
|
||||||
|
NameTooLang = Username is too long (maximum is 39 characters).
|
||||||
|
NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
|
||||||
|
PasswordLessThanSixCharacters = Password must have at least 6 characters
|
||||||
|
InvalidInformation = Invalid information
|
||||||
|
|
137
i18n/languages/locale_fr.ini
Normal file
137
i18n/languages/locale_fr.ini
Normal file
@ -0,0 +1,137 @@
|
|||||||
|
[ApplicationErr]
|
||||||
|
AppNotFound = Application %s not found
|
||||||
|
AppNotFoundForUserID = No application is found for userId: %s
|
||||||
|
GrantTypeNotSupport = Grant_type: %s is not supported in this application
|
||||||
|
HasNoProviders = This application has no providers
|
||||||
|
HasNoProvidersOfType = This application has no providers of type
|
||||||
|
InvalidID = Invalid application id
|
||||||
|
|
||||||
|
[AuthErr]
|
||||||
|
AuthStateWrong = State expected: %s, but got: %s
|
||||||
|
ChallengeMethodErr = Challenge method should be S256
|
||||||
|
CanNotUnlinkUsers = You are not the global admin, you can't unlink other users
|
||||||
|
CanNotLinkMySelf = You can't unlink yourself, you are not a member of any application
|
||||||
|
CallWebAuthnSigninBegin = Please call WebAuthnSigninBegin first
|
||||||
|
NotHuman = Turing test failed.
|
||||||
|
Unauthorized = Unauthorized operation
|
||||||
|
WrongPasswordManyTimes = WrongPasswordManyTimes
|
||||||
|
|
||||||
|
[CasErr]
|
||||||
|
ServiceDoNotMatch = Service %s and %s do not match
|
||||||
|
|
||||||
|
[EmailErr]
|
||||||
|
ExistedErr = Email already exists
|
||||||
|
EmptyErr = Email cannot be empty
|
||||||
|
EmailInvalid = Email is invalid
|
||||||
|
EmailCheckResult = Email: %s
|
||||||
|
EmptyParam = Empty parameters for emailForm: %v
|
||||||
|
InvalidReceivers = Invalid Email receivers: %s
|
||||||
|
UnableGetModifyRule = Unable to get the email modify rule.
|
||||||
|
|
||||||
|
[EnforcerErr]
|
||||||
|
SignInFirst = Please sign in first
|
||||||
|
|
||||||
|
[InitErr]
|
||||||
|
InitScoreFailed = Get init score failed, error: %%w
|
||||||
|
|
||||||
|
[LdapErr]
|
||||||
|
MultipleAccounts = Multiple accounts with same uid, please check your ldap server
|
||||||
|
PasswordWrong = Ldap user name or password incorrect
|
||||||
|
ServerExisted = Ldap server exist
|
||||||
|
|
||||||
|
[LoginErr]
|
||||||
|
AppDoNotExist = The application: %s does not exist
|
||||||
|
AppNotEnableSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support
|
||||||
|
AccountDoNotExist = The account does not exist
|
||||||
|
InvalidUserInformation = Failed to create user, user information is invalid: %s
|
||||||
|
LoginFirst = Please login first
|
||||||
|
LoginFail = Failed to login in: %s
|
||||||
|
NoPermission = You don't have the permission to do this
|
||||||
|
OldUser = The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)
|
||||||
|
ProviderCanNotSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up
|
||||||
|
SessionOutdated = Session outdated, please login again
|
||||||
|
SignOutFirst = Please sign out first before signing in
|
||||||
|
UserDoNotExist = The user: %s/%s doesn't exist
|
||||||
|
UserIsForbidden = The user is forbidden to sign in, please contact the administrator
|
||||||
|
UnknownAuthentication = Unknown authentication type (not password or provider), form = %s
|
||||||
|
UnsupportedPasswordType = unsupported password type: %s
|
||||||
|
|
||||||
|
[OrgErr]
|
||||||
|
DoNotExist = Organization does not exist
|
||||||
|
Immutable = The %s is immutable.
|
||||||
|
OnlyAdmin = Only admin can modify the %s.
|
||||||
|
UnknownModifyRule = Unknown modify rule %s.
|
||||||
|
|
||||||
|
[ParameterErr]
|
||||||
|
OrgMissingErr = Parameter organization is missing
|
||||||
|
Missing = Missing parameter
|
||||||
|
UnknownType = Unknown type
|
||||||
|
Wrong = Wrong parameter
|
||||||
|
|
||||||
|
[PhoneErr]
|
||||||
|
CodeNotSent = Code has not been sent yet!
|
||||||
|
CodeTimeOut = You should verify your code in %d min!
|
||||||
|
ExistedErr = Phone already exists
|
||||||
|
EmptyErr = Phone cannot be empty
|
||||||
|
InvalidReceivers = Invalid phone receivers: %s
|
||||||
|
NumberInvalid = Phone number is invalid
|
||||||
|
NoPrefix = %s No phone prefix
|
||||||
|
PhoneCheckResult = Phone: %s
|
||||||
|
UnableGetModifyRule = Unable to get the phone modify rule.
|
||||||
|
|
||||||
|
[ProviderErr]
|
||||||
|
CanNotBeUnlinked = This provider can't be unlinked
|
||||||
|
CategoryNotSAML = provider %s's category is not SAML
|
||||||
|
DoNotExist = the provider: %s does not exist
|
||||||
|
InvalidProvider = Invalid captcha provider.
|
||||||
|
LinkFirstErr = Please link first
|
||||||
|
ProviderNotEnabled = The provider: %s is not enabled for the application
|
||||||
|
ProviderNotSupported = The provider type: %s is not supported
|
||||||
|
ProviderNotFound = The provider: %s is not found
|
||||||
|
ProviderNotFoundForCategory = No provider for category: %s is found for application: %s
|
||||||
|
|
||||||
|
[ResourceErr]
|
||||||
|
NotAuthorized = You are not authorized to access this resource
|
||||||
|
UserIsNil = User is nil for tag: /"avatar/"
|
||||||
|
UsernameOrFilePathEmpty = Username or fullFilePath is empty: username = %s, fullFilePath = %s
|
||||||
|
|
||||||
|
[SetPasswordErr]
|
||||||
|
CanNotContainBlank = New password cannot contain blank space.
|
||||||
|
LessThanSixCharacters = New password must have at least 6 characters
|
||||||
|
|
||||||
|
[SignUpErr]
|
||||||
|
DoNotAllowSignUp = The application does not allow to sign up new account
|
||||||
|
SignOutFirst = Please sign out first before signing up
|
||||||
|
|
||||||
|
[StorageErr]
|
||||||
|
ObjectKeyNotAllowed = The objectKey: %s is not allowed
|
||||||
|
|
||||||
|
[TokenErr]
|
||||||
|
EmptyClientID = Empty clientId or clientSecret
|
||||||
|
InvalidToken = Invalid token
|
||||||
|
InvalidAppOrWrongClientSecret = Invalid application or wrong clientSecret
|
||||||
|
InvalidClientId = Invalid client_id
|
||||||
|
RedirectURIDoNotExist = Redirect URI: %s doesn't exist in the allowed Redirect URI list
|
||||||
|
|
||||||
|
[UserErr]
|
||||||
|
AffiliationBlankErr = Affiliation cannot be blank
|
||||||
|
DisplayNameBlankErr = DisplayName cannot be blank
|
||||||
|
DisplayNameInvalid = DisplayName is not valid real name
|
||||||
|
DisplayNameCanNotBeEmpty = Display name cannot be empty
|
||||||
|
DoNotExist = The user: %s doesn't exist
|
||||||
|
DoNotExistInOrg = The user: %s/%s doesn't exist
|
||||||
|
DoNotExistSignUp = the user does not exist, please sign up first
|
||||||
|
FirstNameBlankErr = FirstName cannot be blank
|
||||||
|
FailToImportUsers = Failed to import users
|
||||||
|
LastNameBlankErr = LastName cannot be blank
|
||||||
|
NameLessThanTwoCharacters = Username must have at least 2 characters
|
||||||
|
NameStartWithADigitErr = Username cannot start with a digit
|
||||||
|
NameIsEmailErr = Username cannot be an email address
|
||||||
|
NameCantainWhitSpaceErr = Username cannot contain white spaces
|
||||||
|
NameExistedErr = Username already exists
|
||||||
|
NameEmptyErr = Empty username.
|
||||||
|
NameTooLang = Username is too long (maximum is 39 characters).
|
||||||
|
NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
|
||||||
|
PasswordLessThanSixCharacters = Password must have at least 6 characters
|
||||||
|
InvalidInformation = Invalid information
|
||||||
|
|
137
i18n/languages/locale_ja.ini
Normal file
137
i18n/languages/locale_ja.ini
Normal file
@ -0,0 +1,137 @@
|
|||||||
|
[ApplicationErr]
|
||||||
|
AppNotFound = Application %s not found
|
||||||
|
AppNotFoundForUserID = No application is found for userId: %s
|
||||||
|
GrantTypeNotSupport = Grant_type: %s is not supported in this application
|
||||||
|
HasNoProviders = This application has no providers
|
||||||
|
HasNoProvidersOfType = This application has no providers of type
|
||||||
|
InvalidID = Invalid application id
|
||||||
|
|
||||||
|
[AuthErr]
|
||||||
|
AuthStateWrong = State expected: %s, but got: %s
|
||||||
|
ChallengeMethodErr = Challenge method should be S256
|
||||||
|
CanNotUnlinkUsers = You are not the global admin, you can't unlink other users
|
||||||
|
CanNotLinkMySelf = You can't unlink yourself, you are not a member of any application
|
||||||
|
CallWebAuthnSigninBegin = Please call WebAuthnSigninBegin first
|
||||||
|
NotHuman = Turing test failed.
|
||||||
|
Unauthorized = Unauthorized operation
|
||||||
|
WrongPasswordManyTimes = WrongPasswordManyTimes
|
||||||
|
|
||||||
|
[CasErr]
|
||||||
|
ServiceDoNotMatch = Service %s and %s do not match
|
||||||
|
|
||||||
|
[EmailErr]
|
||||||
|
ExistedErr = Email already exists
|
||||||
|
EmptyErr = Email cannot be empty
|
||||||
|
EmailInvalid = Email is invalid
|
||||||
|
EmailCheckResult = Email: %s
|
||||||
|
EmptyParam = Empty parameters for emailForm: %v
|
||||||
|
InvalidReceivers = Invalid Email receivers: %s
|
||||||
|
UnableGetModifyRule = Unable to get the email modify rule.
|
||||||
|
|
||||||
|
[EnforcerErr]
|
||||||
|
SignInFirst = Please sign in first
|
||||||
|
|
||||||
|
[InitErr]
|
||||||
|
InitScoreFailed = Get init score failed, error: %%w
|
||||||
|
|
||||||
|
[LdapErr]
|
||||||
|
MultipleAccounts = Multiple accounts with same uid, please check your ldap server
|
||||||
|
PasswordWrong = Ldap user name or password incorrect
|
||||||
|
ServerExisted = Ldap server exist
|
||||||
|
|
||||||
|
[LoginErr]
|
||||||
|
AppDoNotExist = The application: %s does not exist
|
||||||
|
AppNotEnableSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support
|
||||||
|
AccountDoNotExist = The account does not exist
|
||||||
|
InvalidUserInformation = Failed to create user, user information is invalid: %s
|
||||||
|
LoginFirst = Please login first
|
||||||
|
LoginFail = Failed to login in: %s
|
||||||
|
NoPermission = You don't have the permission to do this
|
||||||
|
OldUser = The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)
|
||||||
|
ProviderCanNotSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up
|
||||||
|
SessionOutdated = Session outdated, please login again
|
||||||
|
SignOutFirst = Please sign out first before signing in
|
||||||
|
UserDoNotExist = The user: %s/%s doesn't exist
|
||||||
|
UserIsForbidden = The user is forbidden to sign in, please contact the administrator
|
||||||
|
UnknownAuthentication = Unknown authentication type (not password or provider), form = %s
|
||||||
|
UnsupportedPasswordType = unsupported password type: %s
|
||||||
|
|
||||||
|
[OrgErr]
|
||||||
|
DoNotExist = Organization does not exist
|
||||||
|
Immutable = The %s is immutable.
|
||||||
|
OnlyAdmin = Only admin can modify the %s.
|
||||||
|
UnknownModifyRule = Unknown modify rule %s.
|
||||||
|
|
||||||
|
[ParameterErr]
|
||||||
|
OrgMissingErr = Parameter organization is missing
|
||||||
|
Missing = Missing parameter
|
||||||
|
UnknownType = Unknown type
|
||||||
|
Wrong = Wrong parameter
|
||||||
|
|
||||||
|
[PhoneErr]
|
||||||
|
CodeNotSent = Code has not been sent yet!
|
||||||
|
CodeTimeOut = You should verify your code in %d min!
|
||||||
|
ExistedErr = Phone already exists
|
||||||
|
EmptyErr = Phone cannot be empty
|
||||||
|
InvalidReceivers = Invalid phone receivers: %s
|
||||||
|
NumberInvalid = Phone number is invalid
|
||||||
|
NoPrefix = %s No phone prefix
|
||||||
|
PhoneCheckResult = Phone: %s
|
||||||
|
UnableGetModifyRule = Unable to get the phone modify rule.
|
||||||
|
|
||||||
|
[ProviderErr]
|
||||||
|
CanNotBeUnlinked = This provider can't be unlinked
|
||||||
|
CategoryNotSAML = provider %s's category is not SAML
|
||||||
|
DoNotExist = the provider: %s does not exist
|
||||||
|
InvalidProvider = Invalid captcha provider.
|
||||||
|
LinkFirstErr = Please link first
|
||||||
|
ProviderNotEnabled = The provider: %s is not enabled for the application
|
||||||
|
ProviderNotSupported = The provider type: %s is not supported
|
||||||
|
ProviderNotFound = The provider: %s is not found
|
||||||
|
ProviderNotFoundForCategory = No provider for category: %s is found for application: %s
|
||||||
|
|
||||||
|
[ResourceErr]
|
||||||
|
NotAuthorized = You are not authorized to access this resource
|
||||||
|
UserIsNil = User is nil for tag: /"avatar/"
|
||||||
|
UsernameOrFilePathEmpty = Username or fullFilePath is empty: username = %s, fullFilePath = %s
|
||||||
|
|
||||||
|
[SetPasswordErr]
|
||||||
|
CanNotContainBlank = New password cannot contain blank space.
|
||||||
|
LessThanSixCharacters = New password must have at least 6 characters
|
||||||
|
|
||||||
|
[SignUpErr]
|
||||||
|
DoNotAllowSignUp = The application does not allow to sign up new account
|
||||||
|
SignOutFirst = Please sign out first before signing up
|
||||||
|
|
||||||
|
[StorageErr]
|
||||||
|
ObjectKeyNotAllowed = The objectKey: %s is not allowed
|
||||||
|
|
||||||
|
[TokenErr]
|
||||||
|
EmptyClientID = Empty clientId or clientSecret
|
||||||
|
InvalidToken = Invalid token
|
||||||
|
InvalidAppOrWrongClientSecret = Invalid application or wrong clientSecret
|
||||||
|
InvalidClientId = Invalid client_id
|
||||||
|
RedirectURIDoNotExist = Redirect URI: %s doesn't exist in the allowed Redirect URI list
|
||||||
|
|
||||||
|
[UserErr]
|
||||||
|
AffiliationBlankErr = Affiliation cannot be blank
|
||||||
|
DisplayNameBlankErr = DisplayName cannot be blank
|
||||||
|
DisplayNameInvalid = DisplayName is not valid real name
|
||||||
|
DisplayNameCanNotBeEmpty = Display name cannot be empty
|
||||||
|
DoNotExist = The user: %s doesn't exist
|
||||||
|
DoNotExistInOrg = The user: %s/%s doesn't exist
|
||||||
|
DoNotExistSignUp = the user does not exist, please sign up first
|
||||||
|
FirstNameBlankErr = FirstName cannot be blank
|
||||||
|
FailToImportUsers = Failed to import users
|
||||||
|
LastNameBlankErr = LastName cannot be blank
|
||||||
|
NameLessThanTwoCharacters = Username must have at least 2 characters
|
||||||
|
NameStartWithADigitErr = Username cannot start with a digit
|
||||||
|
NameIsEmailErr = Username cannot be an email address
|
||||||
|
NameCantainWhitSpaceErr = Username cannot contain white spaces
|
||||||
|
NameExistedErr = Username already exists
|
||||||
|
NameEmptyErr = Empty username.
|
||||||
|
NameTooLang = Username is too long (maximum is 39 characters).
|
||||||
|
NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
|
||||||
|
PasswordLessThanSixCharacters = Password must have at least 6 characters
|
||||||
|
InvalidInformation = Invalid information
|
||||||
|
|
137
i18n/languages/locale_ko.ini
Normal file
137
i18n/languages/locale_ko.ini
Normal file
@ -0,0 +1,137 @@
|
|||||||
|
[ApplicationErr]
|
||||||
|
AppNotFound = Application %s not found
|
||||||
|
AppNotFoundForUserID = No application is found for userId: %s
|
||||||
|
GrantTypeNotSupport = Grant_type: %s is not supported in this application
|
||||||
|
HasNoProviders = This application has no providers
|
||||||
|
HasNoProvidersOfType = This application has no providers of type
|
||||||
|
InvalidID = Invalid application id
|
||||||
|
|
||||||
|
[AuthErr]
|
||||||
|
AuthStateWrong = State expected: %s, but got: %s
|
||||||
|
ChallengeMethodErr = Challenge method should be S256
|
||||||
|
CanNotUnlinkUsers = You are not the global admin, you can't unlink other users
|
||||||
|
CanNotLinkMySelf = You can't unlink yourself, you are not a member of any application
|
||||||
|
CallWebAuthnSigninBegin = Please call WebAuthnSigninBegin first
|
||||||
|
NotHuman = Turing test failed.
|
||||||
|
Unauthorized = Unauthorized operation
|
||||||
|
WrongPasswordManyTimes = WrongPasswordManyTimes
|
||||||
|
|
||||||
|
[CasErr]
|
||||||
|
ServiceDoNotMatch = Service %s and %s do not match
|
||||||
|
|
||||||
|
[EmailErr]
|
||||||
|
ExistedErr = Email already exists
|
||||||
|
EmptyErr = Email cannot be empty
|
||||||
|
EmailInvalid = Email is invalid
|
||||||
|
EmailCheckResult = Email: %s
|
||||||
|
EmptyParam = Empty parameters for emailForm: %v
|
||||||
|
InvalidReceivers = Invalid Email receivers: %s
|
||||||
|
UnableGetModifyRule = Unable to get the email modify rule.
|
||||||
|
|
||||||
|
[EnforcerErr]
|
||||||
|
SignInFirst = Please sign in first
|
||||||
|
|
||||||
|
[InitErr]
|
||||||
|
InitScoreFailed = Get init score failed, error: %%w
|
||||||
|
|
||||||
|
[LdapErr]
|
||||||
|
MultipleAccounts = Multiple accounts with same uid, please check your ldap server
|
||||||
|
PasswordWrong = Ldap user name or password incorrect
|
||||||
|
ServerExisted = Ldap server exist
|
||||||
|
|
||||||
|
[LoginErr]
|
||||||
|
AppDoNotExist = The application: %s does not exist
|
||||||
|
AppNotEnableSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support
|
||||||
|
AccountDoNotExist = The account does not exist
|
||||||
|
InvalidUserInformation = Failed to create user, user information is invalid: %s
|
||||||
|
LoginFirst = Please login first
|
||||||
|
LoginFail = Failed to login in: %s
|
||||||
|
NoPermission = You don't have the permission to do this
|
||||||
|
OldUser = The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)
|
||||||
|
ProviderCanNotSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up
|
||||||
|
SessionOutdated = Session outdated, please login again
|
||||||
|
SignOutFirst = Please sign out first before signing in
|
||||||
|
UserDoNotExist = The user: %s/%s doesn't exist
|
||||||
|
UserIsForbidden = The user is forbidden to sign in, please contact the administrator
|
||||||
|
UnknownAuthentication = Unknown authentication type (not password or provider), form = %s
|
||||||
|
UnsupportedPasswordType = unsupported password type: %s
|
||||||
|
|
||||||
|
[OrgErr]
|
||||||
|
DoNotExist = Organization does not exist
|
||||||
|
Immutable = The %s is immutable.
|
||||||
|
OnlyAdmin = Only admin can modify the %s.
|
||||||
|
UnknownModifyRule = Unknown modify rule %s.
|
||||||
|
|
||||||
|
[ParameterErr]
|
||||||
|
OrgMissingErr = Parameter organization is missing
|
||||||
|
Missing = Missing parameter
|
||||||
|
UnknownType = Unknown type
|
||||||
|
Wrong = Wrong parameter
|
||||||
|
|
||||||
|
[PhoneErr]
|
||||||
|
CodeNotSent = Code has not been sent yet!
|
||||||
|
CodeTimeOut = You should verify your code in %d min!
|
||||||
|
ExistedErr = Phone already exists
|
||||||
|
EmptyErr = Phone cannot be empty
|
||||||
|
InvalidReceivers = Invalid phone receivers: %s
|
||||||
|
NumberInvalid = Phone number is invalid
|
||||||
|
NoPrefix = %s No phone prefix
|
||||||
|
PhoneCheckResult = Phone: %s
|
||||||
|
UnableGetModifyRule = Unable to get the phone modify rule.
|
||||||
|
|
||||||
|
[ProviderErr]
|
||||||
|
CanNotBeUnlinked = This provider can't be unlinked
|
||||||
|
CategoryNotSAML = provider %s's category is not SAML
|
||||||
|
DoNotExist = the provider: %s does not exist
|
||||||
|
InvalidProvider = Invalid captcha provider.
|
||||||
|
LinkFirstErr = Please link first
|
||||||
|
ProviderNotEnabled = The provider: %s is not enabled for the application
|
||||||
|
ProviderNotSupported = The provider type: %s is not supported
|
||||||
|
ProviderNotFound = The provider: %s is not found
|
||||||
|
ProviderNotFoundForCategory = No provider for category: %s is found for application: %s
|
||||||
|
|
||||||
|
[ResourceErr]
|
||||||
|
NotAuthorized = You are not authorized to access this resource
|
||||||
|
UserIsNil = User is nil for tag: /"avatar/"
|
||||||
|
UsernameOrFilePathEmpty = Username or fullFilePath is empty: username = %s, fullFilePath = %s
|
||||||
|
|
||||||
|
[SetPasswordErr]
|
||||||
|
CanNotContainBlank = New password cannot contain blank space.
|
||||||
|
LessThanSixCharacters = New password must have at least 6 characters
|
||||||
|
|
||||||
|
[SignUpErr]
|
||||||
|
DoNotAllowSignUp = The application does not allow to sign up new account
|
||||||
|
SignOutFirst = Please sign out first before signing up
|
||||||
|
|
||||||
|
[StorageErr]
|
||||||
|
ObjectKeyNotAllowed = The objectKey: %s is not allowed
|
||||||
|
|
||||||
|
[TokenErr]
|
||||||
|
EmptyClientID = Empty clientId or clientSecret
|
||||||
|
InvalidToken = Invalid token
|
||||||
|
InvalidAppOrWrongClientSecret = Invalid application or wrong clientSecret
|
||||||
|
InvalidClientId = Invalid client_id
|
||||||
|
RedirectURIDoNotExist = Redirect URI: %s doesn't exist in the allowed Redirect URI list
|
||||||
|
|
||||||
|
[UserErr]
|
||||||
|
AffiliationBlankErr = Affiliation cannot be blank
|
||||||
|
DisplayNameBlankErr = DisplayName cannot be blank
|
||||||
|
DisplayNameInvalid = DisplayName is not valid real name
|
||||||
|
DisplayNameCanNotBeEmpty = Display name cannot be empty
|
||||||
|
DoNotExist = The user: %s doesn't exist
|
||||||
|
DoNotExistInOrg = The user: %s/%s doesn't exist
|
||||||
|
DoNotExistSignUp = the user does not exist, please sign up first
|
||||||
|
FirstNameBlankErr = FirstName cannot be blank
|
||||||
|
FailToImportUsers = Failed to import users
|
||||||
|
LastNameBlankErr = LastName cannot be blank
|
||||||
|
NameLessThanTwoCharacters = Username must have at least 2 characters
|
||||||
|
NameStartWithADigitErr = Username cannot start with a digit
|
||||||
|
NameIsEmailErr = Username cannot be an email address
|
||||||
|
NameCantainWhitSpaceErr = Username cannot contain white spaces
|
||||||
|
NameExistedErr = Username already exists
|
||||||
|
NameEmptyErr = Empty username.
|
||||||
|
NameTooLang = Username is too long (maximum is 39 characters).
|
||||||
|
NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
|
||||||
|
PasswordLessThanSixCharacters = Password must have at least 6 characters
|
||||||
|
InvalidInformation = Invalid information
|
||||||
|
|
137
i18n/languages/locale_ru.ini
Normal file
137
i18n/languages/locale_ru.ini
Normal file
@ -0,0 +1,137 @@
|
|||||||
|
[ApplicationErr]
|
||||||
|
AppNotFound = Application %s not found
|
||||||
|
AppNotFoundForUserID = No application is found for userId: %s
|
||||||
|
GrantTypeNotSupport = Grant_type: %s is not supported in this application
|
||||||
|
HasNoProviders = This application has no providers
|
||||||
|
HasNoProvidersOfType = This application has no providers of type
|
||||||
|
InvalidID = Invalid application id
|
||||||
|
|
||||||
|
[AuthErr]
|
||||||
|
AuthStateWrong = State expected: %s, but got: %s
|
||||||
|
ChallengeMethodErr = Challenge method should be S256
|
||||||
|
CanNotUnlinkUsers = You are not the global admin, you can't unlink other users
|
||||||
|
CanNotLinkMySelf = You can't unlink yourself, you are not a member of any application
|
||||||
|
CallWebAuthnSigninBegin = Please call WebAuthnSigninBegin first
|
||||||
|
NotHuman = Turing test failed.
|
||||||
|
Unauthorized = Unauthorized operation
|
||||||
|
WrongPasswordManyTimes = WrongPasswordManyTimes
|
||||||
|
|
||||||
|
[CasErr]
|
||||||
|
ServiceDoNotMatch = Service %s and %s do not match
|
||||||
|
|
||||||
|
[EmailErr]
|
||||||
|
ExistedErr = Email already exists
|
||||||
|
EmptyErr = Email cannot be empty
|
||||||
|
EmailInvalid = Email is invalid
|
||||||
|
EmailCheckResult = Email: %s
|
||||||
|
EmptyParam = Empty parameters for emailForm: %v
|
||||||
|
InvalidReceivers = Invalid Email receivers: %s
|
||||||
|
UnableGetModifyRule = Unable to get the email modify rule.
|
||||||
|
|
||||||
|
[EnforcerErr]
|
||||||
|
SignInFirst = Please sign in first
|
||||||
|
|
||||||
|
[InitErr]
|
||||||
|
InitScoreFailed = Get init score failed, error: %%w
|
||||||
|
|
||||||
|
[LdapErr]
|
||||||
|
MultipleAccounts = Multiple accounts with same uid, please check your ldap server
|
||||||
|
PasswordWrong = Ldap user name or password incorrect
|
||||||
|
ServerExisted = Ldap server exist
|
||||||
|
|
||||||
|
[LoginErr]
|
||||||
|
AppDoNotExist = The application: %s does not exist
|
||||||
|
AppNotEnableSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support
|
||||||
|
AccountDoNotExist = The account does not exist
|
||||||
|
InvalidUserInformation = Failed to create user, user information is invalid: %s
|
||||||
|
LoginFirst = Please login first
|
||||||
|
LoginFail = Failed to login in: %s
|
||||||
|
NoPermission = You don't have the permission to do this
|
||||||
|
OldUser = The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)
|
||||||
|
ProviderCanNotSignUp = The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up
|
||||||
|
SessionOutdated = Session outdated, please login again
|
||||||
|
SignOutFirst = Please sign out first before signing in
|
||||||
|
UserDoNotExist = The user: %s/%s doesn't exist
|
||||||
|
UserIsForbidden = The user is forbidden to sign in, please contact the administrator
|
||||||
|
UnknownAuthentication = Unknown authentication type (not password or provider), form = %s
|
||||||
|
UnsupportedPasswordType = unsupported password type: %s
|
||||||
|
|
||||||
|
[OrgErr]
|
||||||
|
DoNotExist = Organization does not exist
|
||||||
|
Immutable = The %s is immutable.
|
||||||
|
OnlyAdmin = Only admin can modify the %s.
|
||||||
|
UnknownModifyRule = Unknown modify rule %s.
|
||||||
|
|
||||||
|
[ParameterErr]
|
||||||
|
OrgMissingErr = Parameter organization is missing
|
||||||
|
Missing = Missing parameter
|
||||||
|
UnknownType = Unknown type
|
||||||
|
Wrong = Wrong parameter
|
||||||
|
|
||||||
|
[PhoneErr]
|
||||||
|
CodeNotSent = Code has not been sent yet!
|
||||||
|
CodeTimeOut = You should verify your code in %d min!
|
||||||
|
ExistedErr = Phone already exists
|
||||||
|
EmptyErr = Phone cannot be empty
|
||||||
|
InvalidReceivers = Invalid phone receivers: %s
|
||||||
|
NumberInvalid = Phone number is invalid
|
||||||
|
NoPrefix = %s No phone prefix
|
||||||
|
PhoneCheckResult = Phone: %s
|
||||||
|
UnableGetModifyRule = Unable to get the phone modify rule.
|
||||||
|
|
||||||
|
[ProviderErr]
|
||||||
|
CanNotBeUnlinked = This provider can't be unlinked
|
||||||
|
CategoryNotSAML = provider %s's category is not SAML
|
||||||
|
DoNotExist = the provider: %s does not exist
|
||||||
|
InvalidProvider = Invalid captcha provider.
|
||||||
|
LinkFirstErr = Please link first
|
||||||
|
ProviderNotEnabled = The provider: %s is not enabled for the application
|
||||||
|
ProviderNotSupported = The provider type: %s is not supported
|
||||||
|
ProviderNotFound = The provider: %s is not found
|
||||||
|
ProviderNotFoundForCategory = No provider for category: %s is found for application: %s
|
||||||
|
|
||||||
|
[ResourceErr]
|
||||||
|
NotAuthorized = You are not authorized to access this resource
|
||||||
|
UserIsNil = User is nil for tag: /"avatar/"
|
||||||
|
UsernameOrFilePathEmpty = Username or fullFilePath is empty: username = %s, fullFilePath = %s
|
||||||
|
|
||||||
|
[SetPasswordErr]
|
||||||
|
CanNotContainBlank = New password cannot contain blank space.
|
||||||
|
LessThanSixCharacters = New password must have at least 6 characters
|
||||||
|
|
||||||
|
[SignUpErr]
|
||||||
|
DoNotAllowSignUp = The application does not allow to sign up new account
|
||||||
|
SignOutFirst = Please sign out first before signing up
|
||||||
|
|
||||||
|
[StorageErr]
|
||||||
|
ObjectKeyNotAllowed = The objectKey: %s is not allowed
|
||||||
|
|
||||||
|
[TokenErr]
|
||||||
|
EmptyClientID = Empty clientId or clientSecret
|
||||||
|
InvalidToken = Invalid token
|
||||||
|
InvalidAppOrWrongClientSecret = Invalid application or wrong clientSecret
|
||||||
|
InvalidClientId = Invalid client_id
|
||||||
|
RedirectURIDoNotExist = Redirect URI: %s doesn't exist in the allowed Redirect URI list
|
||||||
|
|
||||||
|
[UserErr]
|
||||||
|
AffiliationBlankErr = Affiliation cannot be blank
|
||||||
|
DisplayNameBlankErr = DisplayName cannot be blank
|
||||||
|
DisplayNameInvalid = DisplayName is not valid real name
|
||||||
|
DisplayNameCanNotBeEmpty = Display name cannot be empty
|
||||||
|
DoNotExist = The user: %s doesn't exist
|
||||||
|
DoNotExistInOrg = The user: %s/%s doesn't exist
|
||||||
|
DoNotExistSignUp = the user does not exist, please sign up first
|
||||||
|
FirstNameBlankErr = FirstName cannot be blank
|
||||||
|
FailToImportUsers = Failed to import users
|
||||||
|
LastNameBlankErr = LastName cannot be blank
|
||||||
|
NameLessThanTwoCharacters = Username must have at least 2 characters
|
||||||
|
NameStartWithADigitErr = Username cannot start with a digit
|
||||||
|
NameIsEmailErr = Username cannot be an email address
|
||||||
|
NameCantainWhitSpaceErr = Username cannot contain white spaces
|
||||||
|
NameExistedErr = Username already exists
|
||||||
|
NameEmptyErr = Empty username.
|
||||||
|
NameTooLang = Username is too long (maximum is 39 characters).
|
||||||
|
NameFormatErr = The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.
|
||||||
|
PasswordLessThanSixCharacters = Password must have at least 6 characters
|
||||||
|
InvalidInformation = Invalid information
|
||||||
|
|
137
i18n/languages/locale_zh.ini
Normal file
137
i18n/languages/locale_zh.ini
Normal file
@ -0,0 +1,137 @@
|
|||||||
|
[ApplicationErr]
|
||||||
|
AppNotFound = 应用 %%s 未找到
|
||||||
|
AppNotFoundForUserID = 找不到该用户的应用程序 %s
|
||||||
|
GrantTypeNotSupport = 此应用中不支持此授权类型
|
||||||
|
HasNoProviders = 该应用无提供商
|
||||||
|
HasNoProvidersOfType = 应用没有该类型的提供商
|
||||||
|
InvalidID = 无效的Application ID
|
||||||
|
|
||||||
|
[AuthErr]
|
||||||
|
AuthStateWrong = 期望状态位: %s, 实际状态为: %s
|
||||||
|
ChallengeMethodErr = Challenge 方法应该为 S256
|
||||||
|
CanNotUnlinkUsers = 您不是全局管理员,无法取消链接其他用户
|
||||||
|
CanNotLinkMySelf = 您无法取消链接,您不是任何应用程序的成员
|
||||||
|
CallWebAuthnSigninBegin = 请先调用WebAuthnSigninBegin
|
||||||
|
NotHuman = 真人验证失败
|
||||||
|
Unauthorized = 未授权的操作
|
||||||
|
WrongPasswordManyTimes = 输入密码错误次数已达上限,请在 %d 分 %d 秒后重试
|
||||||
|
|
||||||
|
[CasErr]
|
||||||
|
ServiceDoNotMatch = 服务 %s 与 %s 不匹配
|
||||||
|
|
||||||
|
[EmailErr]
|
||||||
|
ExistedErr = 该邮箱已存在
|
||||||
|
EmptyErr = 邮箱不可为空
|
||||||
|
EmailInvalid = 无效邮箱
|
||||||
|
EmailCheckResult = Email: %s
|
||||||
|
EmptyParam = 邮件参数为空: %v
|
||||||
|
InvalidReceivers = 无效的邮箱接收者: %%s
|
||||||
|
UnableGetModifyRule = 无法得到Email修改规则
|
||||||
|
|
||||||
|
[EnforcerErr]
|
||||||
|
SignInFirst = 请先登录
|
||||||
|
|
||||||
|
[InitErr]
|
||||||
|
InitScoreFailed = 初始化分数失败: %w
|
||||||
|
|
||||||
|
[LdapErr]
|
||||||
|
MultipleAccounts = 多个帐户具有相同的uid,请检查您的 ldap 服务器
|
||||||
|
PasswordWrong = Ldap密码错误
|
||||||
|
ServerExisted = Ldap服务器已存在
|
||||||
|
|
||||||
|
[LoginErr]
|
||||||
|
AppDoNotExist = 应用不存在: %s
|
||||||
|
AppNotEnableSignUp = 提供商账户: %s 与用户名: %s (%s) 不存在且 不允许注册新账户, 请联系IT支持
|
||||||
|
AccountDoNotExist = 账户不存在
|
||||||
|
InvalidUserInformation = 创建用户失败,用户信息无效: %%s
|
||||||
|
LoginFirst = 请先登录
|
||||||
|
LoginFail = 无法登录: %s
|
||||||
|
NoPermission = 您没有权限执行此操作
|
||||||
|
OldUser = 提供商账户: %s 与用户名: %s (%s) 已经与其他账户绑定: %s (%s)
|
||||||
|
ProviderCanNotSignUp = 提供商账户: %s 与用户名: %s (%s) 不存在且 不允许通过 %s 注册新账户, 请使用其他方式注册
|
||||||
|
SignOutFirst = 请在登录前登出
|
||||||
|
SessionOutdated = Session已过期,请重新登陆
|
||||||
|
UserDoNotExist = 用户不存在: %s/%s
|
||||||
|
UserIsForbidden = 该用户被禁止登陆,请联系管理员
|
||||||
|
UnknownAuthentication = 未知的认证类型 (非密码或提供商认证), form = %s
|
||||||
|
UnsupportedPasswordType = 不支持此密码类型
|
||||||
|
|
||||||
|
[OrgErr]
|
||||||
|
DoNotExist = 组织不存在
|
||||||
|
Immutable = %s是不可变的
|
||||||
|
OnlyAdmin = 只有管理员用户有此权限
|
||||||
|
UnknownModifyRule = 未知的修改规则
|
||||||
|
|
||||||
|
[ParameterErr]
|
||||||
|
Missing = 参数丢失
|
||||||
|
OrgMissingErr = Organization参数丢失
|
||||||
|
UnknownType = 未知类型
|
||||||
|
Wrong = 参数错误
|
||||||
|
|
||||||
|
[PhoneErr]
|
||||||
|
CodeNotSent = 验证码还未发送
|
||||||
|
CodeTimeOut = 验证码过期
|
||||||
|
ExistedErr = 该电话已存在
|
||||||
|
EmptyErr = 电话不可为空
|
||||||
|
InvalidReceivers = 无效的电话接收者: %s
|
||||||
|
NumberInvalid = 无效电话
|
||||||
|
PhoneCheckResult = 电话: %s
|
||||||
|
UnableGetModifyRule = 无法得到电话修改规则
|
||||||
|
NoPrefix = %s 无此电话前缀
|
||||||
|
|
||||||
|
[ProviderErr]
|
||||||
|
CanNotBeUnlinked = 该提供商不可被链接
|
||||||
|
InvalidProvider = 无效的验证码提供商
|
||||||
|
LinkFirstErr = 请先绑定
|
||||||
|
ProviderNotEnabled = 提供商: %s 未被启用
|
||||||
|
ProviderNotSupported = 不支持该类型的提供商: %s
|
||||||
|
ProviderNotFound = 该提供商未找到: %s
|
||||||
|
ProviderNotFoundForCategory = 该类型的提供商: %s 在应用中未找到: %s
|
||||||
|
DoNotExist = 提供商: %s 不存在
|
||||||
|
CategoryNotSAML = 提供商 %s类型不是SAML
|
||||||
|
|
||||||
|
[ResourceErr]
|
||||||
|
NotAuthorized = 您无权获取此资源
|
||||||
|
UserIsNil = 用户头像标签为空
|
||||||
|
UsernameOrFilePathEmpty = username或FilePath为空: username = %s, fullFilePath = %s
|
||||||
|
|
||||||
|
[SetPasswordErr]
|
||||||
|
CanNotContainBlank = 新密码不可以包含空客
|
||||||
|
LessThanSixCharacters = 新密码至少为6位
|
||||||
|
|
||||||
|
[SignUpErr]
|
||||||
|
DoNotAllowSignUp = 该应用不允许注册新账户
|
||||||
|
SignOutFirst = 请在登陆前登出
|
||||||
|
|
||||||
|
[TokenErr]
|
||||||
|
EmptyClientID = clientId或clientSecret为空
|
||||||
|
InvalidAppOrWrongClientSecret = 无效应用或错误的clientSecret
|
||||||
|
InvalidToken = 无效token
|
||||||
|
InvalidClientId = 无效的ClientId
|
||||||
|
RedirectURIDoNotExist = 重定向 URI:%s 在可列表中未找到
|
||||||
|
|
||||||
|
[UserErr]
|
||||||
|
AffiliationBlankErr = 联系方式不可为空
|
||||||
|
DisplayNameBlankErr = 展示名称不可为空
|
||||||
|
DisplayNameInvalid = 展示名称无效
|
||||||
|
DisplayNameCanNotBeEmpty = 展示名称不可为空
|
||||||
|
DoNotExist = 用户不存在: %s
|
||||||
|
DoNotExistInOrg = 用户不存在: %s/%s
|
||||||
|
FirstNameBlankErr = 名不可以为空
|
||||||
|
FailToImportUsers = 导入用户失败
|
||||||
|
LastNameBlankErr = 姓不可以为空
|
||||||
|
NameLessThanTwoCharacters = 用户名至少要有2个字符
|
||||||
|
NameStartWithADigitErr = 用户名禁止使用数字作为第一个字符
|
||||||
|
NameIsEmailErr = 用户名不可以是邮箱地址
|
||||||
|
NameCantainWhitSpaceErr = 用户名不可以包含空格
|
||||||
|
NameExistedErr = 用户名已存在
|
||||||
|
NameEmptyErr = 用户名不可为空
|
||||||
|
NameTooLang = 用户名过长(最大长度为39个字符)
|
||||||
|
NameFormatErr = 用户名只能包含字母数字字符、下划线或连字符,不能有连续的连字符或下划线,也不能以连字符或下划线开头或结尾
|
||||||
|
PasswordLessThanSixCharacters = 密码至少为6字符
|
||||||
|
DoNotExistSignUp = 用户不存在,请先注册
|
||||||
|
InvalidInformation = 无效信息
|
||||||
|
|
||||||
|
[StorageErr]
|
||||||
|
ObjectKeyNotAllowed = object key :%s 不被允许
|
||||||
|
|
28
i18n/util.go
28
i18n/util.go
@ -15,10 +15,21 @@
|
|||||||
package i18n
|
package i18n
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"embed"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
|
"gopkg.in/ini.v1"
|
||||||
|
)
|
||||||
|
|
||||||
|
//go:embed languages/*.ini
|
||||||
|
var f embed.FS
|
||||||
|
|
||||||
|
var (
|
||||||
|
langMapConfig = make(map[string]*ini.File)
|
||||||
|
isNotFirstLoad = make(map[string]bool)
|
||||||
)
|
)
|
||||||
|
|
||||||
func getI18nFilePath(language string) string {
|
func getI18nFilePath(language string) string {
|
||||||
@ -62,3 +73,20 @@ func applyData(data1 *I18nData, data2 *I18nData) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func Translate(lang string, error string) string {
|
||||||
|
parts := strings.Split(error, ".")
|
||||||
|
if !strings.Contains(error, ".") || len(parts) != 2 {
|
||||||
|
log.Println("Invalid Error Name")
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
if isNotFirstLoad[lang] {
|
||||||
|
return langMapConfig[lang].Section(parts[0]).Key(parts[1]).String()
|
||||||
|
} else {
|
||||||
|
file, _ := f.ReadFile("languages/locale_" + lang + ".ini")
|
||||||
|
langMapConfig[lang], _ = ini.Load(file)
|
||||||
|
isNotFirstLoad[lang] = true
|
||||||
|
return langMapConfig[lang].Section(parts[0]).Key(parts[1]).String()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -121,6 +121,7 @@ func (idp *DingTalkIdProvider) GetToken(code string) (*oauth2.Token, error) {
|
|||||||
type DingTalkUserResponse struct {
|
type DingTalkUserResponse struct {
|
||||||
Nick string `json:"nick"`
|
Nick string `json:"nick"`
|
||||||
OpenId string `json:"openId"`
|
OpenId string `json:"openId"`
|
||||||
|
UnionId string `json:"unionId"`
|
||||||
AvatarUrl string `json:"avatarUrl"`
|
AvatarUrl string `json:"avatarUrl"`
|
||||||
Email string `json:"email"`
|
Email string `json:"email"`
|
||||||
Errmsg string `json:"message"`
|
Errmsg string `json:"message"`
|
||||||
@ -162,6 +163,7 @@ func (idp *DingTalkIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, erro
|
|||||||
Id: dtUserInfo.OpenId,
|
Id: dtUserInfo.OpenId,
|
||||||
Username: dtUserInfo.Nick,
|
Username: dtUserInfo.Nick,
|
||||||
DisplayName: dtUserInfo.Nick,
|
DisplayName: dtUserInfo.Nick,
|
||||||
|
UnionId: dtUserInfo.UnionId,
|
||||||
Email: dtUserInfo.Email,
|
Email: dtUserInfo.Email,
|
||||||
AvatarUrl: dtUserInfo.AvatarUrl,
|
AvatarUrl: dtUserInfo.AvatarUrl,
|
||||||
}
|
}
|
||||||
|
@ -282,7 +282,7 @@ func getUser(gothUser goth.User, provider string) *UserInfo {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if provider == "steam" {
|
if provider == "steam" {
|
||||||
user.Username = user.DisplayName
|
user.Username = user.Id
|
||||||
user.Email = ""
|
user.Email = ""
|
||||||
}
|
}
|
||||||
return &user
|
return &user
|
||||||
|
@ -25,6 +25,7 @@ type UserInfo struct {
|
|||||||
Id string
|
Id string
|
||||||
Username string
|
Username string
|
||||||
DisplayName string
|
DisplayName string
|
||||||
|
UnionId string
|
||||||
Email string
|
Email string
|
||||||
AvatarUrl string
|
AvatarUrl string
|
||||||
}
|
}
|
||||||
|
10
main.go
10
main.go
@ -18,11 +18,12 @@ import (
|
|||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/astaxie/beego"
|
"github.com/beego/beego"
|
||||||
"github.com/astaxie/beego/logs"
|
"github.com/beego/beego/logs"
|
||||||
_ "github.com/astaxie/beego/session/redis"
|
_ "github.com/beego/beego/session/redis"
|
||||||
"github.com/casdoor/casdoor/authz"
|
"github.com/casdoor/casdoor/authz"
|
||||||
"github.com/casdoor/casdoor/conf"
|
"github.com/casdoor/casdoor/conf"
|
||||||
|
"github.com/casdoor/casdoor/controllers"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/proxy"
|
"github.com/casdoor/casdoor/proxy"
|
||||||
"github.com/casdoor/casdoor/routers"
|
"github.com/casdoor/casdoor/routers"
|
||||||
@ -76,5 +77,8 @@ func main() {
|
|||||||
port := beego.AppConfig.DefaultInt("httpport", 8000)
|
port := beego.AppConfig.DefaultInt("httpport", 8000)
|
||||||
// logs.SetLevel(logs.LevelInformational)
|
// logs.SetLevel(logs.LevelInformational)
|
||||||
logs.SetLogFuncCall(false)
|
logs.SetLogFuncCall(false)
|
||||||
|
|
||||||
|
go controllers.StartLdapServer()
|
||||||
|
|
||||||
beego.Run(fmt.Sprintf(":%v", port))
|
beego.Run(fmt.Sprintf(":%v", port))
|
||||||
}
|
}
|
||||||
|
@ -18,12 +18,14 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
|
||||||
"github.com/astaxie/beego"
|
"github.com/beego/beego"
|
||||||
|
xormadapter "github.com/casbin/xorm-adapter/v3"
|
||||||
"github.com/casdoor/casdoor/conf"
|
"github.com/casdoor/casdoor/conf"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
_ "github.com/denisenkom/go-mssqldb" // db = mssql
|
_ "github.com/denisenkom/go-mssqldb" // db = mssql
|
||||||
_ "github.com/go-sql-driver/mysql" // db = mysql
|
_ "github.com/go-sql-driver/mysql" // db = mysql
|
||||||
_ "github.com/lib/pq" // db = postgres
|
_ "github.com/lib/pq" // db = postgres
|
||||||
|
"xorm.io/xorm/migrate"
|
||||||
//_ "github.com/mattn/go-sqlite3" // db = sqlite3
|
//_ "github.com/mattn/go-sqlite3" // db = sqlite3
|
||||||
"xorm.io/core"
|
"xorm.io/core"
|
||||||
"xorm.io/xorm"
|
"xorm.io/xorm"
|
||||||
@ -40,10 +42,11 @@ func InitConfig() {
|
|||||||
beego.BConfig.WebConfig.Session.SessionOn = true
|
beego.BConfig.WebConfig.Session.SessionOn = true
|
||||||
|
|
||||||
InitAdapter(true)
|
InitAdapter(true)
|
||||||
|
initMigrations()
|
||||||
}
|
}
|
||||||
|
|
||||||
func InitAdapter(createDatabase bool) {
|
func InitAdapter(createDatabase bool) {
|
||||||
adapter = NewAdapter(conf.GetConfigString("driverName"), conf.GetBeegoConfDataSourceName(), conf.GetConfigString("dbName"))
|
adapter = NewAdapter(conf.GetConfigString("driverName"), conf.GetConfigDataSourceName(), conf.GetConfigString("dbName"))
|
||||||
if createDatabase {
|
if createDatabase {
|
||||||
adapter.CreateDatabase()
|
adapter.CreateDatabase()
|
||||||
}
|
}
|
||||||
@ -145,6 +148,11 @@ func (a *Adapter) createTable() {
|
|||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
err = a.Engine.Sync2(new(CasbinAdapter))
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
err = a.Engine.Sync2(new(Provider))
|
err = a.Engine.Sync2(new(Provider))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
@ -209,6 +217,11 @@ func (a *Adapter) createTable() {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
err = a.Engine.Sync2(new(xormadapter.CasbinRule))
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetSession(owner string, offset, limit int, field, value, sortField, sortOrder string) *xorm.Session {
|
func GetSession(owner string, offset, limit int, field, value, sortField, sortOrder string) *xorm.Session {
|
||||||
@ -234,3 +247,22 @@ func GetSession(owner string, offset, limit int, field, value, sortField, sortOr
|
|||||||
}
|
}
|
||||||
return session
|
return session
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func initMigrations() {
|
||||||
|
migrations := []*migrate.Migration{
|
||||||
|
{
|
||||||
|
ID: "20221015CasbinRule--fill ptype field with p",
|
||||||
|
Migrate: func(tx *xorm.Engine) error {
|
||||||
|
_, err := tx.Cols("ptype").Update(&xormadapter.CasbinRule{
|
||||||
|
Ptype: "p",
|
||||||
|
})
|
||||||
|
return err
|
||||||
|
},
|
||||||
|
Rollback: func(tx *xorm.Engine) error {
|
||||||
|
return tx.DropTables(&xormadapter.CasbinRule{})
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
m := migrate.New(adapter.Engine, migrate.DefaultOptions, migrations)
|
||||||
|
m.Migrate()
|
||||||
|
}
|
||||||
|
@ -17,6 +17,7 @@ package object
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
@ -45,6 +46,7 @@ type Application struct {
|
|||||||
EnablePassword bool `json:"enablePassword"`
|
EnablePassword bool `json:"enablePassword"`
|
||||||
EnableSignUp bool `json:"enableSignUp"`
|
EnableSignUp bool `json:"enableSignUp"`
|
||||||
EnableSigninSession bool `json:"enableSigninSession"`
|
EnableSigninSession bool `json:"enableSigninSession"`
|
||||||
|
EnableAutoSignin bool `json:"enableAutoSignin"`
|
||||||
EnableCodeSignin bool `json:"enableCodeSignin"`
|
EnableCodeSignin bool `json:"enableCodeSignin"`
|
||||||
EnableSamlCompress bool `json:"enableSamlCompress"`
|
EnableSamlCompress bool `json:"enableSamlCompress"`
|
||||||
EnableWebAuthn bool `json:"enableWebAuthn"`
|
EnableWebAuthn bool `json:"enableWebAuthn"`
|
||||||
@ -66,6 +68,10 @@ type Application struct {
|
|||||||
TermsOfUse string `xorm:"varchar(100)" json:"termsOfUse"`
|
TermsOfUse string `xorm:"varchar(100)" json:"termsOfUse"`
|
||||||
SignupHtml string `xorm:"mediumtext" json:"signupHtml"`
|
SignupHtml string `xorm:"mediumtext" json:"signupHtml"`
|
||||||
SigninHtml string `xorm:"mediumtext" json:"signinHtml"`
|
SigninHtml string `xorm:"mediumtext" json:"signinHtml"`
|
||||||
|
FormCss string `xorm:"text" json:"formCss"`
|
||||||
|
FormOffset int `json:"formOffset"`
|
||||||
|
FormSideHtml string `xorm:"mediumtext" json:"formSideHtml"`
|
||||||
|
FormBackgroundUrl string `xorm:"varchar(200)" json:"formBackgroundUrl"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetApplicationCount(owner, field, value string) int {
|
func GetApplicationCount(owner, field, value string) int {
|
||||||
@ -319,7 +325,8 @@ func (application *Application) GetId() string {
|
|||||||
func CheckRedirectUriValid(application *Application, redirectUri string) bool {
|
func CheckRedirectUriValid(application *Application, redirectUri string) bool {
|
||||||
validUri := false
|
validUri := false
|
||||||
for _, tmpUri := range application.RedirectUris {
|
for _, tmpUri := range application.RedirectUris {
|
||||||
if strings.Contains(redirectUri, tmpUri) {
|
tmpUriRegex := regexp.MustCompile(tmpUri)
|
||||||
|
if tmpUriRegex.MatchString(redirectUri) || strings.Contains(redirectUri, tmpUri) {
|
||||||
validUri = true
|
validUri = true
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -50,7 +50,7 @@ func downloadFile(url string) (*bytes.Buffer, error) {
|
|||||||
return fileBuffer, nil
|
return fileBuffer, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func getPermanentAvatarUrl(organization string, username string, url string) string {
|
func getPermanentAvatarUrl(organization string, username string, url string, upload bool) string {
|
||||||
if url == "" {
|
if url == "" {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
@ -62,6 +62,14 @@ func getPermanentAvatarUrl(organization string, username string, url string) str
|
|||||||
fullFilePath := fmt.Sprintf("/avatar/%s/%s.png", organization, username)
|
fullFilePath := fmt.Sprintf("/avatar/%s/%s.png", organization, username)
|
||||||
uploadedFileUrl, _ := getUploadFileUrl(defaultStorageProvider, fullFilePath, false)
|
uploadedFileUrl, _ := getUploadFileUrl(defaultStorageProvider, fullFilePath, false)
|
||||||
|
|
||||||
|
if upload {
|
||||||
|
DownloadAndUpload(url, fullFilePath)
|
||||||
|
}
|
||||||
|
|
||||||
|
return uploadedFileUrl
|
||||||
|
}
|
||||||
|
|
||||||
|
func DownloadAndUpload(url string, fullFilePath string) {
|
||||||
fileBuffer, err := downloadFile(url)
|
fileBuffer, err := downloadFile(url)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
@ -71,6 +79,4 @@ func getPermanentAvatarUrl(organization string, username string, url string) str
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return uploadedFileUrl
|
|
||||||
}
|
}
|
||||||
|
@ -32,7 +32,7 @@ func TestSyncPermanentAvatars(t *testing.T) {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
user.PermanentAvatar = getPermanentAvatarUrl(user.Owner, user.Name, user.Avatar)
|
user.PermanentAvatar = getPermanentAvatarUrl(user.Owner, user.Name, user.Avatar, true)
|
||||||
updateUserColumn("permanent_avatar", user)
|
updateUserColumn("permanent_avatar", user)
|
||||||
fmt.Printf("[%d/%d]: Update user: [%s]'s permanent avatar: %s\n", i, len(users), user.GetId(), user.PermanentAvatar)
|
fmt.Printf("[%d/%d]: Update user: [%s]'s permanent avatar: %s\n", i, len(users), user.GetId(), user.PermanentAvatar)
|
||||||
}
|
}
|
||||||
|
216
object/casbin_adapter.go
Normal file
216
object/casbin_adapter.go
Normal file
@ -0,0 +1,216 @@
|
|||||||
|
// Copyright 2022 The Casdoor Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// 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.
|
||||||
|
|
||||||
|
package object
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/casbin/casbin/v2"
|
||||||
|
"github.com/casbin/casbin/v2/model"
|
||||||
|
xormadapter "github.com/casbin/xorm-adapter/v3"
|
||||||
|
"github.com/casdoor/casdoor/util"
|
||||||
|
"xorm.io/core"
|
||||||
|
)
|
||||||
|
|
||||||
|
type CasbinAdapter struct {
|
||||||
|
Owner string `xorm:"varchar(100) notnull pk" json:"owner"`
|
||||||
|
Name string `xorm:"varchar(100) notnull pk" json:"name"`
|
||||||
|
CreatedTime string `xorm:"varchar(100)" json:"createdTime"`
|
||||||
|
|
||||||
|
Organization string `xorm:"varchar(100)" json:"organization"`
|
||||||
|
Type string `xorm:"varchar(100)" json:"type"`
|
||||||
|
Model string `xorm:"varchar(100)" json:"model"`
|
||||||
|
|
||||||
|
Host string `xorm:"varchar(100)" json:"host"`
|
||||||
|
Port int `json:"port"`
|
||||||
|
User string `xorm:"varchar(100)" json:"user"`
|
||||||
|
Password string `xorm:"varchar(100)" json:"password"`
|
||||||
|
DatabaseType string `xorm:"varchar(100)" json:"databaseType"`
|
||||||
|
Database string `xorm:"varchar(100)" json:"database"`
|
||||||
|
Table string `xorm:"varchar(100)" json:"table"`
|
||||||
|
IsEnabled bool `json:"isEnabled"`
|
||||||
|
|
||||||
|
Adapter *xormadapter.Adapter `xorm:"-" json:"-"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetCasbinAdapterCount(owner, field, value string) int {
|
||||||
|
session := GetSession(owner, -1, -1, field, value, "", "")
|
||||||
|
count, err := session.Count(&CasbinAdapter{})
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return int(count)
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetCasbinAdapters(owner string) []*CasbinAdapter {
|
||||||
|
adapters := []*CasbinAdapter{}
|
||||||
|
err := adapter.Engine.Where("owner = ?", owner).Find(&adapters)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return adapters
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetPaginationCasbinAdapters(owner string, page, limit int, field, value, sort, order string) []*CasbinAdapter {
|
||||||
|
session := GetSession(owner, page, limit, field, value, sort, order)
|
||||||
|
adapters := []*CasbinAdapter{}
|
||||||
|
err := session.Find(&adapters)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return adapters
|
||||||
|
}
|
||||||
|
|
||||||
|
func getCasbinAdapter(owner, name string) *CasbinAdapter {
|
||||||
|
if owner == "" || name == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
casbinAdapter := CasbinAdapter{Owner: owner, Name: name}
|
||||||
|
existed, err := adapter.Engine.Get(&casbinAdapter)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if existed {
|
||||||
|
return &casbinAdapter
|
||||||
|
} else {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetCasbinAdapter(id string) *CasbinAdapter {
|
||||||
|
owner, name := util.GetOwnerAndNameFromId(id)
|
||||||
|
return getCasbinAdapter(owner, name)
|
||||||
|
}
|
||||||
|
|
||||||
|
func UpdateCasbinAdapter(id string, casbinAdapter *CasbinAdapter) bool {
|
||||||
|
owner, name := util.GetOwnerAndNameFromId(id)
|
||||||
|
if getCasbinAdapter(owner, name) == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
session := adapter.Engine.ID(core.PK{owner, name}).AllCols()
|
||||||
|
if casbinAdapter.Password == "***" {
|
||||||
|
session.Omit("password")
|
||||||
|
}
|
||||||
|
affected, err := session.Update(casbinAdapter)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return affected != 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func AddCasbinAdapter(casbinAdapter *CasbinAdapter) bool {
|
||||||
|
affected, err := adapter.Engine.Insert(casbinAdapter)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return affected != 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func DeleteCasbinAdapter(casbinAdapter *CasbinAdapter) bool {
|
||||||
|
affected, err := adapter.Engine.ID(core.PK{casbinAdapter.Owner, casbinAdapter.Name}).Delete(&CasbinAdapter{})
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return affected != 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func (casbinAdapter *CasbinAdapter) GetId() string {
|
||||||
|
return fmt.Sprintf("%s/%s", casbinAdapter.Owner, casbinAdapter.Name)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (casbinAdapter *CasbinAdapter) getTable() string {
|
||||||
|
if casbinAdapter.DatabaseType == "mssql" {
|
||||||
|
return fmt.Sprintf("[%s]", casbinAdapter.Table)
|
||||||
|
} else {
|
||||||
|
return casbinAdapter.Table
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func safeReturn(policy []string, i int) string {
|
||||||
|
if len(policy) > i {
|
||||||
|
return policy[i]
|
||||||
|
} else {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func matrixToCasbinRules(pType string, policies [][]string) []*xormadapter.CasbinRule {
|
||||||
|
res := []*xormadapter.CasbinRule{}
|
||||||
|
|
||||||
|
for _, policy := range policies {
|
||||||
|
line := xormadapter.CasbinRule{
|
||||||
|
Ptype: pType,
|
||||||
|
V0: safeReturn(policy, 0),
|
||||||
|
V1: safeReturn(policy, 1),
|
||||||
|
V2: safeReturn(policy, 2),
|
||||||
|
V3: safeReturn(policy, 3),
|
||||||
|
V4: safeReturn(policy, 4),
|
||||||
|
V5: safeReturn(policy, 5),
|
||||||
|
}
|
||||||
|
res = append(res, &line)
|
||||||
|
}
|
||||||
|
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
|
||||||
|
func SyncPolicies(casbinAdapter *CasbinAdapter) []*xormadapter.CasbinRule {
|
||||||
|
// init Adapter
|
||||||
|
if casbinAdapter.Adapter == nil {
|
||||||
|
var dataSourceName string
|
||||||
|
if casbinAdapter.DatabaseType == "mssql" {
|
||||||
|
dataSourceName = fmt.Sprintf("sqlserver://%s:%s@%s:%d?database=%s", casbinAdapter.User, casbinAdapter.Password, casbinAdapter.Host, casbinAdapter.Port, casbinAdapter.Database)
|
||||||
|
} else if casbinAdapter.DatabaseType == "postgres" {
|
||||||
|
dataSourceName = fmt.Sprintf("user=%s password=%s host=%s port=%d sslmode=disable dbname=%s", casbinAdapter.User, casbinAdapter.Password, casbinAdapter.Host, casbinAdapter.Port, casbinAdapter.Database)
|
||||||
|
} else {
|
||||||
|
dataSourceName = fmt.Sprintf("%s:%s@tcp(%s:%d)/", casbinAdapter.User, casbinAdapter.Password, casbinAdapter.Host, casbinAdapter.Port)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !isCloudIntranet {
|
||||||
|
dataSourceName = strings.ReplaceAll(dataSourceName, "dbi.", "db.")
|
||||||
|
}
|
||||||
|
|
||||||
|
casbinAdapter.Adapter, _ = xormadapter.NewAdapterByEngineWithTableName(NewAdapter(casbinAdapter.DatabaseType, dataSourceName, casbinAdapter.Database).Engine, casbinAdapter.getTable(), "")
|
||||||
|
}
|
||||||
|
|
||||||
|
// init Model
|
||||||
|
modelObj := getModel(casbinAdapter.Owner, casbinAdapter.Model)
|
||||||
|
m, err := model.NewModelFromString(modelObj.ModelText)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// init Enforcer
|
||||||
|
enforcer, err := casbin.NewEnforcer(m, casbinAdapter.Adapter)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
policies := matrixToCasbinRules("p", enforcer.GetPolicy())
|
||||||
|
if strings.Contains(modelObj.ModelText, "[role_definition]") {
|
||||||
|
policies = append(policies, matrixToCasbinRules("g", enforcer.GetGroupingPolicy())...)
|
||||||
|
}
|
||||||
|
|
||||||
|
return policies
|
||||||
|
}
|
124
object/check.go
124
object/check.go
@ -22,6 +22,7 @@ import (
|
|||||||
"unicode"
|
"unicode"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/cred"
|
"github.com/casdoor/casdoor/cred"
|
||||||
|
"github.com/casdoor/casdoor/i18n"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
goldap "github.com/go-ldap/ldap/v3"
|
goldap "github.com/go-ldap/ldap/v3"
|
||||||
)
|
)
|
||||||
@ -41,84 +42,89 @@ func init() {
|
|||||||
reFieldWhiteList, _ = regexp.Compile(`^[A-Za-z0-9]+$`)
|
reFieldWhiteList, _ = regexp.Compile(`^[A-Za-z0-9]+$`)
|
||||||
}
|
}
|
||||||
|
|
||||||
func CheckUserSignup(application *Application, organization *Organization, username string, password string, displayName string, firstName string, lastName string, email string, phone string, affiliation string) string {
|
func CheckUserSignup(application *Application, organization *Organization, username string, password string, displayName string, firstName string, lastName string, email string, phone string, affiliation string, lang string) string {
|
||||||
if organization == nil {
|
if organization == nil {
|
||||||
return "organization does not exist"
|
return i18n.Translate(lang, "OrgErr.DoNotExist")
|
||||||
}
|
}
|
||||||
|
|
||||||
if application.IsSignupItemVisible("Username") {
|
if application.IsSignupItemVisible("Username") {
|
||||||
if len(username) <= 1 {
|
if len(username) <= 1 {
|
||||||
return "username must have at least 2 characters"
|
return i18n.Translate(lang, "UserErr.NameLessThanTwoCharacters")
|
||||||
}
|
}
|
||||||
if unicode.IsDigit(rune(username[0])) {
|
if unicode.IsDigit(rune(username[0])) {
|
||||||
return "username cannot start with a digit"
|
return i18n.Translate(lang, "UserErr.NameStartWithADigitErr")
|
||||||
}
|
}
|
||||||
if util.IsEmailValid(username) {
|
if util.IsEmailValid(username) {
|
||||||
return "username cannot be an email address"
|
return i18n.Translate(lang, "UserErr.NameIsEmailErr")
|
||||||
}
|
}
|
||||||
if reWhiteSpace.MatchString(username) {
|
if reWhiteSpace.MatchString(username) {
|
||||||
return "username cannot contain white spaces"
|
return i18n.Translate(lang, "UserErr.NameCantainWhitSpaceErr")
|
||||||
}
|
}
|
||||||
|
msg := CheckUsername(username, lang)
|
||||||
|
if msg != "" {
|
||||||
|
return msg
|
||||||
|
}
|
||||||
|
|
||||||
if HasUserByField(organization.Name, "name", username) {
|
if HasUserByField(organization.Name, "name", username) {
|
||||||
return "username already exists"
|
return i18n.Translate(lang, "UserErr.NameExistedErr")
|
||||||
}
|
}
|
||||||
if HasUserByField(organization.Name, "email", email) {
|
if HasUserByField(organization.Name, "email", email) {
|
||||||
return "email already exists"
|
return i18n.Translate(lang, "EmailErr.ExistedErr")
|
||||||
}
|
}
|
||||||
if HasUserByField(organization.Name, "phone", phone) {
|
if HasUserByField(organization.Name, "phone", phone) {
|
||||||
return "phone already exists"
|
return i18n.Translate(lang, "PhoneErr.ExistedErr")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(password) <= 5 {
|
if len(password) <= 5 {
|
||||||
return "password must have at least 6 characters"
|
return i18n.Translate(lang, "UserErr.PasswordLessThanSixCharacters")
|
||||||
}
|
}
|
||||||
|
|
||||||
if application.IsSignupItemVisible("Email") {
|
if application.IsSignupItemVisible("Email") {
|
||||||
if email == "" {
|
if email == "" {
|
||||||
if application.IsSignupItemRequired("Email") {
|
if application.IsSignupItemRequired("Email") {
|
||||||
return "email cannot be empty"
|
return i18n.Translate(lang, "EmailErr.EmptyErr")
|
||||||
} else {
|
} else {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if HasUserByField(organization.Name, "email", email) {
|
if HasUserByField(organization.Name, "email", email) {
|
||||||
return "email already exists"
|
return i18n.Translate(lang, "EmailErr.ExistedErr")
|
||||||
} else if !util.IsEmailValid(email) {
|
} else if !util.IsEmailValid(email) {
|
||||||
return "email is invalid"
|
return i18n.Translate(lang, "EmailErr.EmailInvalid")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if application.IsSignupItemVisible("Phone") {
|
if application.IsSignupItemVisible("Phone") {
|
||||||
if phone == "" {
|
if phone == "" {
|
||||||
if application.IsSignupItemRequired("Phone") {
|
if application.IsSignupItemRequired("Phone") {
|
||||||
return "phone cannot be empty"
|
return i18n.Translate(lang, "PhoneErr.EmptyErr")
|
||||||
} else {
|
} else {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if HasUserByField(organization.Name, "phone", phone) {
|
if HasUserByField(organization.Name, "phone", phone) {
|
||||||
return "phone already exists"
|
return i18n.Translate(lang, "PhoneErr.ExistedErr")
|
||||||
} else if organization.PhonePrefix == "86" && !util.IsPhoneCnValid(phone) {
|
} else if organization.PhonePrefix == "86" && !util.IsPhoneCnValid(phone) {
|
||||||
return "phone number is invalid"
|
return i18n.Translate(lang, "PhoneErr.NumberInvalid")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if application.IsSignupItemVisible("Display name") {
|
if application.IsSignupItemVisible("Display name") {
|
||||||
if application.GetSignupItemRule("Display name") == "First, last" && (firstName != "" || lastName != "") {
|
if application.GetSignupItemRule("Display name") == "First, last" && (firstName != "" || lastName != "") {
|
||||||
if firstName == "" {
|
if firstName == "" {
|
||||||
return "firstName cannot be blank"
|
return i18n.Translate(lang, "UserErr.FirstNameBlankErr")
|
||||||
} else if lastName == "" {
|
} else if lastName == "" {
|
||||||
return "lastName cannot be blank"
|
return i18n.Translate(lang, "UserErr.LastNameBlankErr")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if displayName == "" {
|
if displayName == "" {
|
||||||
return "displayName cannot be blank"
|
return i18n.Translate(lang, "UserErr.DisplayNameBlankErr")
|
||||||
} else if application.GetSignupItemRule("Display name") == "Real name" {
|
} else if application.GetSignupItemRule("Display name") == "Real name" {
|
||||||
if !isValidRealName(displayName) {
|
if !isValidRealName(displayName) {
|
||||||
return "displayName is not valid real name"
|
return i18n.Translate(lang, "UserErr.DisplayNameInvalid")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -126,14 +132,14 @@ func CheckUserSignup(application *Application, organization *Organization, usern
|
|||||||
|
|
||||||
if application.IsSignupItemVisible("Affiliation") {
|
if application.IsSignupItemVisible("Affiliation") {
|
||||||
if affiliation == "" {
|
if affiliation == "" {
|
||||||
return "affiliation cannot be blank"
|
return i18n.Translate(lang, "UserErr.AffiliationBlankErr")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
func checkSigninErrorTimes(user *User) string {
|
func checkSigninErrorTimes(user *User, lang string) string {
|
||||||
if user.SigninWrongTimes >= SigninWrongTimesLimit {
|
if user.SigninWrongTimes >= SigninWrongTimesLimit {
|
||||||
lastSignWrongTime, _ := time.Parse(time.RFC3339, user.LastSigninWrongTime)
|
lastSignWrongTime, _ := time.Parse(time.RFC3339, user.LastSigninWrongTime)
|
||||||
passedTime := time.Now().UTC().Sub(lastSignWrongTime)
|
passedTime := time.Now().UTC().Sub(lastSignWrongTime)
|
||||||
@ -141,7 +147,7 @@ func checkSigninErrorTimes(user *User) string {
|
|||||||
|
|
||||||
// deny the login if the error times is greater than the limit and the last login time is less than the duration
|
// deny the login if the error times is greater than the limit and the last login time is less than the duration
|
||||||
if seconds > 0 {
|
if seconds > 0 {
|
||||||
return fmt.Sprintf("You have entered the wrong password too many times, please wait for %d minutes %d seconds and try again", seconds/60, seconds%60)
|
return fmt.Sprintf(i18n.Translate(lang, "AuthErr.WrongPasswordManyTimes"), seconds/60, seconds%60)
|
||||||
}
|
}
|
||||||
|
|
||||||
// reset the error times
|
// reset the error times
|
||||||
@ -153,15 +159,15 @@ func checkSigninErrorTimes(user *User) string {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
func CheckPassword(user *User, password string) string {
|
func CheckPassword(user *User, password string, lang string) string {
|
||||||
// check the login error times
|
// check the login error times
|
||||||
if msg := checkSigninErrorTimes(user); msg != "" {
|
if msg := checkSigninErrorTimes(user, lang); msg != "" {
|
||||||
return msg
|
return msg
|
||||||
}
|
}
|
||||||
|
|
||||||
organization := GetOrganizationByUser(user)
|
organization := GetOrganizationByUser(user)
|
||||||
if organization == nil {
|
if organization == nil {
|
||||||
return "organization does not exist"
|
return i18n.Translate(lang, "OrgErr.DoNotExist")
|
||||||
}
|
}
|
||||||
|
|
||||||
credManager := cred.GetCredManager(organization.PasswordType)
|
credManager := cred.GetCredManager(organization.PasswordType)
|
||||||
@ -180,11 +186,11 @@ func CheckPassword(user *User, password string) string {
|
|||||||
|
|
||||||
return recordSigninErrorInfo(user)
|
return recordSigninErrorInfo(user)
|
||||||
} else {
|
} else {
|
||||||
return fmt.Sprintf("unsupported password type: %s", organization.PasswordType)
|
return fmt.Sprintf(i18n.Translate(lang, "LoginErr.UnsupportedPasswordType"), organization.PasswordType)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func checkLdapUserPassword(user *User, password string) (*User, string) {
|
func checkLdapUserPassword(user *User, password string, lang string) (*User, string) {
|
||||||
ldaps := GetLdaps(user.Owner)
|
ldaps := GetLdaps(user.Owner)
|
||||||
ldapLoginSuccess := false
|
ldapLoginSuccess := false
|
||||||
for _, ldapServer := range ldaps {
|
for _, ldapServer := range ldaps {
|
||||||
@ -204,7 +210,7 @@ func checkLdapUserPassword(user *User, password string) (*User, string) {
|
|||||||
if len(searchResult.Entries) == 0 {
|
if len(searchResult.Entries) == 0 {
|
||||||
continue
|
continue
|
||||||
} else if len(searchResult.Entries) > 1 {
|
} else if len(searchResult.Entries) > 1 {
|
||||||
return nil, "Error: multiple accounts with same uid, please check your ldap server"
|
return nil, i18n.Translate(lang, "LdapErr.MultipleAccounts")
|
||||||
}
|
}
|
||||||
|
|
||||||
dn := searchResult.Entries[0].DN
|
dn := searchResult.Entries[0].DN
|
||||||
@ -215,26 +221,26 @@ func checkLdapUserPassword(user *User, password string) (*User, string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !ldapLoginSuccess {
|
if !ldapLoginSuccess {
|
||||||
return nil, "ldap user name or password incorrect"
|
return nil, i18n.Translate(lang, "LdapErr.PasswordWrong")
|
||||||
}
|
}
|
||||||
return user, ""
|
return user, ""
|
||||||
}
|
}
|
||||||
|
|
||||||
func CheckUserPassword(organization string, username string, password string) (*User, string) {
|
func CheckUserPassword(organization string, username string, password string, lang string) (*User, string) {
|
||||||
user := GetUserByFields(organization, username)
|
user := GetUserByFields(organization, username)
|
||||||
if user == nil || user.IsDeleted == true {
|
if user == nil || user.IsDeleted == true {
|
||||||
return nil, "the user does not exist, please sign up first"
|
return nil, i18n.Translate(lang, "UserErr.DoNotExistSignUp")
|
||||||
}
|
}
|
||||||
|
|
||||||
if user.IsForbidden {
|
if user.IsForbidden {
|
||||||
return nil, "the user is forbidden to sign in, please contact the administrator"
|
return nil, i18n.Translate(lang, "LoginErr.UserIsForbidden")
|
||||||
}
|
}
|
||||||
|
|
||||||
if user.Ldap != "" {
|
if user.Ldap != "" {
|
||||||
// ONLY for ldap users
|
// ONLY for ldap users
|
||||||
return checkLdapUserPassword(user, password)
|
return checkLdapUserPassword(user, password, lang)
|
||||||
} else {
|
} else {
|
||||||
msg := CheckPassword(user, password)
|
msg := CheckPassword(user, password, lang)
|
||||||
if msg != "" {
|
if msg != "" {
|
||||||
return nil, msg
|
return nil, msg
|
||||||
}
|
}
|
||||||
@ -246,15 +252,15 @@ func filterField(field string) bool {
|
|||||||
return reFieldWhiteList.MatchString(field)
|
return reFieldWhiteList.MatchString(field)
|
||||||
}
|
}
|
||||||
|
|
||||||
func CheckUserPermission(requestUserId, userId, userOwner string, strict bool) (bool, error) {
|
func CheckUserPermission(requestUserId, userId, userOwner string, strict bool, lang string) (bool, error) {
|
||||||
if requestUserId == "" {
|
if requestUserId == "" {
|
||||||
return false, fmt.Errorf("please login first")
|
return false, fmt.Errorf(i18n.Translate(lang, "LoginErr.LoginFirst"))
|
||||||
}
|
}
|
||||||
|
|
||||||
if userId != "" {
|
if userId != "" {
|
||||||
targetUser := GetUser(userId)
|
targetUser := GetUser(userId)
|
||||||
if targetUser == nil {
|
if targetUser == nil {
|
||||||
return false, fmt.Errorf("the user: %s doesn't exist", userId)
|
return false, fmt.Errorf(i18n.Translate(lang, "UserErr.DoNotExist"), userId)
|
||||||
}
|
}
|
||||||
|
|
||||||
userOwner = targetUser.Owner
|
userOwner = targetUser.Owner
|
||||||
@ -266,7 +272,7 @@ func CheckUserPermission(requestUserId, userId, userOwner string, strict bool) (
|
|||||||
} else {
|
} else {
|
||||||
requestUser := GetUser(requestUserId)
|
requestUser := GetUser(requestUserId)
|
||||||
if requestUser == nil {
|
if requestUser == nil {
|
||||||
return false, fmt.Errorf("session outdated, please login again")
|
return false, fmt.Errorf(i18n.Translate(lang, "LoginErr.SessionOutdated"))
|
||||||
}
|
}
|
||||||
if requestUser.IsGlobalAdmin {
|
if requestUser.IsGlobalAdmin {
|
||||||
hasPermission = true
|
hasPermission = true
|
||||||
@ -281,7 +287,7 @@ func CheckUserPermission(requestUserId, userId, userOwner string, strict bool) (
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return hasPermission, fmt.Errorf("you don't have the permission to do this")
|
return hasPermission, fmt.Errorf(i18n.Translate(lang, "LoginErr.NoPermission"))
|
||||||
}
|
}
|
||||||
|
|
||||||
func CheckAccessPermission(userId string, application *Application) (bool, error) {
|
func CheckAccessPermission(userId string, application *Application) (bool, error) {
|
||||||
@ -313,3 +319,41 @@ func CheckAccessPermission(userId string, application *Application) (bool, error
|
|||||||
}
|
}
|
||||||
return allowed, err
|
return allowed, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func CheckUsername(username string, lang string) string {
|
||||||
|
if username == "" {
|
||||||
|
return i18n.Translate(lang, "UserErr.NameEmptyErr")
|
||||||
|
} else if len(username) > 39 {
|
||||||
|
return i18n.Translate(lang, "UserErr.NameTooLang")
|
||||||
|
}
|
||||||
|
|
||||||
|
exclude, _ := regexp.Compile("^[\u0021-\u007E]+$")
|
||||||
|
if !exclude.MatchString(username) {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// https://stackoverflow.com/questions/58726546/github-username-convention-using-regex
|
||||||
|
re, _ := regexp.Compile("^[a-zA-Z0-9]+((?:-[a-zA-Z0-9]+)|(?:_[a-zA-Z0-9]+))*$")
|
||||||
|
if !re.MatchString(username) {
|
||||||
|
return i18n.Translate(lang, "UserErr.NameFormatErr")
|
||||||
|
}
|
||||||
|
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func CheckToEnableCaptcha(application *Application) bool {
|
||||||
|
if len(application.Providers) == 0 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, providerItem := range application.Providers {
|
||||||
|
if providerItem.Provider == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if providerItem.Provider.Category == "Captcha" && providerItem.Provider.Type == "Default" {
|
||||||
|
return providerItem.Rule == "Always"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
@ -143,7 +143,7 @@ func initBuiltInApplication() {
|
|||||||
EnablePassword: true,
|
EnablePassword: true,
|
||||||
EnableSignUp: true,
|
EnableSignUp: true,
|
||||||
Providers: []*ProviderItem{
|
Providers: []*ProviderItem{
|
||||||
{Name: "provider_captcha_default", CanSignUp: false, CanSignIn: false, CanUnlink: false, Prompted: false, AlertType: "None", Provider: nil},
|
{Name: "provider_captcha_default", CanSignUp: false, CanSignIn: false, CanUnlink: false, Prompted: false, AlertType: "None", Rule: "None", Provider: nil},
|
||||||
},
|
},
|
||||||
SignupItems: []*SignupItem{
|
SignupItems: []*SignupItem{
|
||||||
{Name: "ID", Visible: false, Required: true, Prompted: false, Rule: "Random"},
|
{Name: "ID", Visible: false, Required: true, Prompted: false, Rule: "Random"},
|
||||||
@ -157,6 +157,7 @@ func initBuiltInApplication() {
|
|||||||
},
|
},
|
||||||
RedirectUris: []string{},
|
RedirectUris: []string{},
|
||||||
ExpireInHours: 168,
|
ExpireInHours: 168,
|
||||||
|
FormOffset: 8,
|
||||||
}
|
}
|
||||||
AddApplication(application)
|
AddApplication(application)
|
||||||
}
|
}
|
||||||
|
@ -19,7 +19,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/astaxie/beego"
|
"github.com/beego/beego"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
goldap "github.com/go-ldap/ldap/v3"
|
goldap "github.com/go-ldap/ldap/v3"
|
||||||
"github.com/thanhpk/randstr"
|
"github.com/thanhpk/randstr"
|
||||||
@ -409,6 +409,7 @@ func SyncLdapUsers(owner string, users []LdapRespUser, ldapId string) (*[]LdapRe
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if !found && !AddUser(&User{
|
if !found && !AddUser(&User{
|
||||||
Owner: owner,
|
Owner: owner,
|
||||||
Name: buildLdapUserName(user.Uid, user.UidNumber),
|
Name: buildLdapUserName(user.Uid, user.UidNumber),
|
||||||
|
@ -5,7 +5,7 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/astaxie/beego/logs"
|
"github.com/beego/beego/logs"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
74
object/ldapserver.go
Normal file
74
object/ldapserver.go
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
// Copyright 2022 The Casdoor Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// 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.
|
||||||
|
|
||||||
|
package object
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/forestmgy/ldapserver"
|
||||||
|
)
|
||||||
|
|
||||||
|
func GetNameAndOrgFromDN(DN string) (string, string, string) {
|
||||||
|
DNValue := strings.Split(DN, ",")
|
||||||
|
if len(DNValue) == 1 || strings.ToLower(DNValue[0])[0] != 'c' || strings.ToLower(DNValue[1])[0] != 'o' {
|
||||||
|
return "", "", "please use correct Admin Name format like cn=xxx,ou=xxx,dc=example,dc=com"
|
||||||
|
}
|
||||||
|
return DNValue[0][3:], DNValue[1][3:], ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetUserNameAndOrgFromBaseDnAndFilter(baseDN, filter string) (string, string, int) {
|
||||||
|
if !strings.Contains(baseDN, "ou=") || !strings.Contains(filter, "cn=") {
|
||||||
|
return "", "", ldapserver.LDAPResultInvalidDNSyntax
|
||||||
|
}
|
||||||
|
name := getUserNameFromFilter(filter)
|
||||||
|
_, org, _ := GetNameAndOrgFromDN(fmt.Sprintf("cn=%s,", name) + baseDN)
|
||||||
|
errCode := ldapserver.LDAPResultSuccess
|
||||||
|
return name, org, errCode
|
||||||
|
}
|
||||||
|
|
||||||
|
func getUserNameFromFilter(filter string) string {
|
||||||
|
nameIndex := strings.Index(filter, "cn=")
|
||||||
|
var name string
|
||||||
|
for i := nameIndex + 3; filter[i] != ')'; i++ {
|
||||||
|
name = name + string(filter[i])
|
||||||
|
}
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetFilteredUsers(m *ldapserver.Message, name, org string) ([]*User, int) {
|
||||||
|
var filteredUsers []*User
|
||||||
|
if name == "*" && m.Client.IsOrgAdmin { // get all users from organization 'org'
|
||||||
|
if m.Client.OrgName == "built-in" && org == "*" {
|
||||||
|
filteredUsers = GetGlobalUsers()
|
||||||
|
return filteredUsers, ldapserver.LDAPResultSuccess
|
||||||
|
} else if m.Client.OrgName == "built-in" || org == m.Client.OrgName {
|
||||||
|
filteredUsers = GetUsers(org)
|
||||||
|
return filteredUsers, ldapserver.LDAPResultSuccess
|
||||||
|
} else {
|
||||||
|
return nil, ldapserver.LDAPResultInsufficientAccessRights
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
hasPermission, err := CheckUserPermission(fmt.Sprintf("%s/%s", m.Client.OrgName, m.Client.UserName), fmt.Sprintf("%s/%s", org, name), org, true, "en")
|
||||||
|
if !hasPermission {
|
||||||
|
log.Printf("ErrMsg = %v", err.Error())
|
||||||
|
return nil, ldapserver.LDAPResultInsufficientAccessRights
|
||||||
|
}
|
||||||
|
user := getUser(org, name)
|
||||||
|
filteredUsers = append(filteredUsers, user)
|
||||||
|
return filteredUsers, ldapserver.LDAPResultSuccess
|
||||||
|
}
|
||||||
|
}
|
@ -18,6 +18,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/cred"
|
"github.com/casdoor/casdoor/cred"
|
||||||
|
"github.com/casdoor/casdoor/i18n"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
"xorm.io/core"
|
"xorm.io/core"
|
||||||
)
|
)
|
||||||
@ -41,6 +42,7 @@ type Organization struct {
|
|||||||
PasswordSalt string `xorm:"varchar(100)" json:"passwordSalt"`
|
PasswordSalt string `xorm:"varchar(100)" json:"passwordSalt"`
|
||||||
PhonePrefix string `xorm:"varchar(10)" json:"phonePrefix"`
|
PhonePrefix string `xorm:"varchar(10)" json:"phonePrefix"`
|
||||||
DefaultAvatar string `xorm:"varchar(100)" json:"defaultAvatar"`
|
DefaultAvatar string `xorm:"varchar(100)" json:"defaultAvatar"`
|
||||||
|
DefaultApplication string `xorm:"varchar(100)" json:"defaultApplication"`
|
||||||
Tags []string `xorm:"mediumtext" json:"tags"`
|
Tags []string `xorm:"mediumtext" json:"tags"`
|
||||||
MasterPassword string `xorm:"varchar(100)" json:"masterPassword"`
|
MasterPassword string `xorm:"varchar(100)" json:"masterPassword"`
|
||||||
EnableSoftDeletion bool `json:"enableSoftDeletion"`
|
EnableSoftDeletion bool `json:"enableSoftDeletion"`
|
||||||
@ -201,18 +203,52 @@ func GetAccountItemByName(name string, organization *Organization) *AccountItem
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func CheckAccountItemModifyRule(accountItem *AccountItem, user *User) (bool, string) {
|
func CheckAccountItemModifyRule(accountItem *AccountItem, user *User, lang string) (bool, string) {
|
||||||
switch accountItem.ModifyRule {
|
switch accountItem.ModifyRule {
|
||||||
case "Admin":
|
case "Admin":
|
||||||
if !(user.IsAdmin || user.IsGlobalAdmin) {
|
if !(user.IsAdmin || user.IsGlobalAdmin) {
|
||||||
return false, fmt.Sprintf("Only admin can modify the %s.", accountItem.Name)
|
return false, fmt.Sprintf(i18n.Translate(lang, "OrgErr.OnlyAdmin"), accountItem.Name)
|
||||||
}
|
}
|
||||||
case "Immutable":
|
case "Immutable":
|
||||||
return false, fmt.Sprintf("The %s is immutable.", accountItem.Name)
|
return false, fmt.Sprintf(i18n.Translate(lang, "OrgErr.Immutable"), accountItem.Name)
|
||||||
case "Self":
|
case "Self":
|
||||||
break
|
break
|
||||||
default:
|
default:
|
||||||
return false, fmt.Sprintf("Unknown modify rule %s.", accountItem.ModifyRule)
|
return false, fmt.Sprintf(i18n.Translate(lang, "OrgErr.UnknownModifyRule"), accountItem.ModifyRule)
|
||||||
}
|
}
|
||||||
return true, ""
|
return true, ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetDefaultApplication(id string) (*Application, error) {
|
||||||
|
organization := GetOrganization(id)
|
||||||
|
if organization == nil {
|
||||||
|
return nil, fmt.Errorf("The organization: %s does not exist", id)
|
||||||
|
}
|
||||||
|
|
||||||
|
if organization.DefaultApplication != "" {
|
||||||
|
return getApplication("admin", organization.DefaultApplication), fmt.Errorf("The default application: %s does not exist", organization.DefaultApplication)
|
||||||
|
}
|
||||||
|
|
||||||
|
applications := []*Application{}
|
||||||
|
err := adapter.Engine.Asc("created_time").Find(&applications, &Application{Organization: organization.Name})
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(applications) == 0 {
|
||||||
|
return nil, fmt.Errorf("The application does not exist")
|
||||||
|
}
|
||||||
|
|
||||||
|
defaultApplication := applications[0]
|
||||||
|
for _, application := range applications {
|
||||||
|
if application.EnableSignUp {
|
||||||
|
defaultApplication = application
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
extendApplicationWithProviders(defaultApplication)
|
||||||
|
extendApplicationWithOrg(defaultApplication)
|
||||||
|
|
||||||
|
return defaultApplication, nil
|
||||||
|
}
|
||||||
|
@ -19,7 +19,7 @@ import (
|
|||||||
|
|
||||||
"github.com/casbin/casbin/v2"
|
"github.com/casbin/casbin/v2"
|
||||||
"github.com/casbin/casbin/v2/model"
|
"github.com/casbin/casbin/v2/model"
|
||||||
xormadapter "github.com/casbin/xorm-adapter/v2"
|
xormadapter "github.com/casbin/xorm-adapter/v3"
|
||||||
"github.com/casdoor/casdoor/conf"
|
"github.com/casdoor/casdoor/conf"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -29,7 +29,7 @@ func getEnforcer(permission *Permission) *casbin.Enforcer {
|
|||||||
tableName = permission.Adapter
|
tableName = permission.Adapter
|
||||||
}
|
}
|
||||||
tableNamePrefix := conf.GetConfigString("tableNamePrefix")
|
tableNamePrefix := conf.GetConfigString("tableNamePrefix")
|
||||||
adapter, err := xormadapter.NewAdapterWithTableName(conf.GetConfigString("driverName"), conf.GetBeegoConfDataSourceName()+conf.GetConfigString("dbName"), tableName, tableNamePrefix, true)
|
adapter, err := xormadapter.NewAdapterWithTableName(conf.GetConfigString("driverName"), conf.GetConfigDataSourceName()+conf.GetConfigString("dbName"), tableName, tableNamePrefix, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
@ -17,6 +17,7 @@ package object
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/casdoor/casdoor/i18n"
|
||||||
"github.com/casdoor/casdoor/pp"
|
"github.com/casdoor/casdoor/pp"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
"xorm.io/core"
|
"xorm.io/core"
|
||||||
@ -228,7 +229,7 @@ func (p *Provider) GetId() string {
|
|||||||
return fmt.Sprintf("%s/%s", p.Owner, p.Name)
|
return fmt.Sprintf("%s/%s", p.Owner, p.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetCaptchaProviderByOwnerName(applicationId string) (*Provider, error) {
|
func GetCaptchaProviderByOwnerName(applicationId, lang string) (*Provider, error) {
|
||||||
owner, name := util.GetOwnerAndNameFromId(applicationId)
|
owner, name := util.GetOwnerAndNameFromId(applicationId)
|
||||||
provider := Provider{Owner: owner, Name: name, Category: "Captcha"}
|
provider := Provider{Owner: owner, Name: name, Category: "Captcha"}
|
||||||
existed, err := adapter.Engine.Get(&provider)
|
existed, err := adapter.Engine.Get(&provider)
|
||||||
@ -237,26 +238,26 @@ func GetCaptchaProviderByOwnerName(applicationId string) (*Provider, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !existed {
|
if !existed {
|
||||||
return nil, fmt.Errorf("the provider: %s does not exist", applicationId)
|
return nil, fmt.Errorf(i18n.Translate(lang, "ProviderErr.DoNotExist"), applicationId)
|
||||||
}
|
}
|
||||||
|
|
||||||
return &provider, nil
|
return &provider, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetCaptchaProviderByApplication(applicationId, isCurrentProvider string) (*Provider, error) {
|
func GetCaptchaProviderByApplication(applicationId, isCurrentProvider, lang string) (*Provider, error) {
|
||||||
if isCurrentProvider == "true" {
|
if isCurrentProvider == "true" {
|
||||||
return GetCaptchaProviderByOwnerName(applicationId)
|
return GetCaptchaProviderByOwnerName(applicationId, lang)
|
||||||
}
|
}
|
||||||
application := GetApplication(applicationId)
|
application := GetApplication(applicationId)
|
||||||
if application == nil || len(application.Providers) == 0 {
|
if application == nil || len(application.Providers) == 0 {
|
||||||
return nil, fmt.Errorf("invalid application id")
|
return nil, fmt.Errorf(i18n.Translate(lang, "ApplicationErr.InvalidID"))
|
||||||
}
|
}
|
||||||
for _, provider := range application.Providers {
|
for _, provider := range application.Providers {
|
||||||
if provider.Provider == nil {
|
if provider.Provider == nil {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if provider.Provider.Category == "Captcha" {
|
if provider.Provider.Category == "Captcha" {
|
||||||
return GetCaptchaProviderByOwnerName(fmt.Sprintf("%s/%s", provider.Provider.Owner, provider.Provider.Name))
|
return GetCaptchaProviderByOwnerName(fmt.Sprintf("%s/%s", provider.Provider.Owner, provider.Provider.Name), lang)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil, nil
|
return nil, nil
|
||||||
|
@ -21,6 +21,7 @@ type ProviderItem struct {
|
|||||||
CanUnlink bool `json:"canUnlink"`
|
CanUnlink bool `json:"canUnlink"`
|
||||||
Prompted bool `json:"prompted"`
|
Prompted bool `json:"prompted"`
|
||||||
AlertType string `json:"alertType"`
|
AlertType string `json:"alertType"`
|
||||||
|
Rule string `json:"rule"`
|
||||||
Provider *Provider `json:"provider"`
|
Provider *Provider `json:"provider"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/astaxie/beego/context"
|
"github.com/beego/beego/context"
|
||||||
"github.com/casdoor/casdoor/conf"
|
"github.com/casdoor/casdoor/conf"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
@ -101,9 +101,9 @@ func AddRecord(record *Record) bool {
|
|||||||
return affected != 0
|
return affected != 0
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetRecordCount(field, value string) int {
|
func GetRecordCount(field, value string, filterRecord *Record) int {
|
||||||
session := GetSession("", -1, -1, field, value, "", "")
|
session := GetSession("", -1, -1, field, value, "", "")
|
||||||
count, err := session.Count(&Record{})
|
count, err := session.Count(filterRecord)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
@ -121,10 +121,10 @@ func GetRecords() []*Record {
|
|||||||
return records
|
return records
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetPaginationRecords(offset, limit int, field, value, sortField, sortOrder string) []*Record {
|
func GetPaginationRecords(offset, limit int, field, value, sortField, sortOrder string, filterRecord *Record) []*Record {
|
||||||
records := []*Record{}
|
records := []*Record{}
|
||||||
session := GetSession("", offset, limit, field, value, sortField, sortOrder)
|
session := GetSession("", offset, limit, field, value, sortField, sortOrder)
|
||||||
err := session.Find(&records)
|
err := session.Find(&records, filterRecord)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
@ -24,6 +24,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/conf"
|
"github.com/casdoor/casdoor/conf"
|
||||||
|
"github.com/casdoor/casdoor/i18n"
|
||||||
saml2 "github.com/russellhaering/gosaml2"
|
saml2 "github.com/russellhaering/gosaml2"
|
||||||
dsig "github.com/russellhaering/goxmldsig"
|
dsig "github.com/russellhaering/goxmldsig"
|
||||||
)
|
)
|
||||||
@ -41,10 +42,10 @@ func ParseSamlResponse(samlResponse string, providerType string) (string, error)
|
|||||||
return assertionInfo.NameID, nil
|
return assertionInfo.NameID, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func GenerateSamlLoginUrl(id, relayState string) (string, string, error) {
|
func GenerateSamlLoginUrl(id, relayState, lang string) (string, string, error) {
|
||||||
provider := GetProvider(id)
|
provider := GetProvider(id)
|
||||||
if provider.Category != "SAML" {
|
if provider.Category != "SAML" {
|
||||||
return "", "", fmt.Errorf("provider %s's category is not SAML", provider.Name)
|
return "", "", fmt.Errorf(i18n.Translate(lang, "ProviderErr.CategoryNotSAML"), provider.Name)
|
||||||
}
|
}
|
||||||
sp, err := buildSp(provider, "")
|
sp, err := buildSp(provider, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -21,6 +21,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/conf"
|
"github.com/casdoor/casdoor/conf"
|
||||||
|
"github.com/casdoor/casdoor/i18n"
|
||||||
"github.com/casdoor/casdoor/storage"
|
"github.com/casdoor/casdoor/storage"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
@ -126,11 +127,16 @@ func UploadFileSafe(provider *Provider, fullFilePath string, fileBuffer *bytes.B
|
|||||||
return fileUrl, objectKey, nil
|
return fileUrl, objectKey, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func DeleteFile(provider *Provider, objectKey string) error {
|
func DeleteFile(provider *Provider, objectKey string, lang string) error {
|
||||||
|
// check fullFilePath is there security issue
|
||||||
|
if strings.Contains(objectKey, "..") {
|
||||||
|
return fmt.Errorf(i18n.Translate(lang, "StorageErr.ObjectKeyNotAllowed"), objectKey)
|
||||||
|
}
|
||||||
|
|
||||||
endpoint := getProviderEndpoint(provider)
|
endpoint := getProviderEndpoint(provider)
|
||||||
storageProvider := storage.GetStorageProvider(provider.Type, provider.ClientId, provider.ClientSecret, provider.RegionId, provider.Bucket, endpoint)
|
storageProvider := storage.GetStorageProvider(provider.Type, provider.ClientId, provider.ClientSecret, provider.RegionId, provider.Bucket, endpoint)
|
||||||
if storageProvider == nil {
|
if storageProvider == nil {
|
||||||
return fmt.Errorf("the provider type: %s is not supported", provider.Type)
|
return fmt.Errorf(i18n.Translate(lang, "ProviderErr.ProviderNotSupported"), provider.Type)
|
||||||
}
|
}
|
||||||
|
|
||||||
if provider.Domain == "" {
|
if provider.Domain == "" {
|
||||||
|
@ -120,7 +120,7 @@ func (syncer *Syncer) updateUserForOriginalFields(user *User) (bool, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if user.Avatar != oldUser.Avatar && user.Avatar != "" {
|
if user.Avatar != oldUser.Avatar && user.Avatar != "" {
|
||||||
user.PermanentAvatar = getPermanentAvatarUrl(user.Owner, user.Name, user.Avatar)
|
user.PermanentAvatar = getPermanentAvatarUrl(user.Owner, user.Name, user.Avatar, true)
|
||||||
}
|
}
|
||||||
|
|
||||||
columns := syncer.getCasdoorColumns()
|
columns := syncer.getCasdoorColumns()
|
||||||
|
@ -21,6 +21,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/casdoor/casdoor/i18n"
|
||||||
"github.com/casdoor/casdoor/idp"
|
"github.com/casdoor/casdoor/idp"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
"xorm.io/core"
|
"xorm.io/core"
|
||||||
@ -238,14 +239,14 @@ func GetTokenByTokenAndApplication(token string, application string) *Token {
|
|||||||
return &tokenResult
|
return &tokenResult
|
||||||
}
|
}
|
||||||
|
|
||||||
func CheckOAuthLogin(clientId string, responseType string, redirectUri string, scope string, state string) (string, *Application) {
|
func CheckOAuthLogin(clientId string, responseType string, redirectUri string, scope string, state string, lang string) (string, *Application) {
|
||||||
if responseType != "code" && responseType != "token" && responseType != "id_token" {
|
if responseType != "code" && responseType != "token" && responseType != "id_token" {
|
||||||
return fmt.Sprintf("error: grant_type: %s is not supported in this application", responseType), nil
|
return fmt.Sprintf(i18n.Translate(lang, "ApplicationErr.GrantTypeNotSupport"), responseType), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
application := GetApplicationByClientId(clientId)
|
application := GetApplicationByClientId(clientId)
|
||||||
if application == nil {
|
if application == nil {
|
||||||
return "Invalid client_id", nil
|
return i18n.Translate(lang, "TokenErr.InvalidClientId"), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
validUri := false
|
validUri := false
|
||||||
@ -256,7 +257,7 @@ func CheckOAuthLogin(clientId string, responseType string, redirectUri string, s
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if !validUri {
|
if !validUri {
|
||||||
return fmt.Sprintf("Redirect URI: \"%s\" doesn't exist in the allowed Redirect URI list", redirectUri), application
|
return fmt.Sprintf(i18n.Translate(lang, "TokenErr.RedirectURIDoNotExist"), redirectUri), application
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mask application for /api/get-app-login
|
// Mask application for /api/get-app-login
|
||||||
@ -264,7 +265,7 @@ func CheckOAuthLogin(clientId string, responseType string, redirectUri string, s
|
|||||||
return "", application
|
return "", application
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetOAuthCode(userId string, clientId string, responseType string, redirectUri string, scope string, state string, nonce string, challenge string, host string) *Code {
|
func GetOAuthCode(userId string, clientId string, responseType string, redirectUri string, scope string, state string, nonce string, challenge string, host string, lang string) *Code {
|
||||||
user := GetUser(userId)
|
user := GetUser(userId)
|
||||||
if user == nil {
|
if user == nil {
|
||||||
return &Code{
|
return &Code{
|
||||||
@ -279,7 +280,7 @@ func GetOAuthCode(userId string, clientId string, responseType string, redirectU
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
msg, application := CheckOAuthLogin(clientId, responseType, redirectUri, scope, state)
|
msg, application := CheckOAuthLogin(clientId, responseType, redirectUri, scope, state, lang)
|
||||||
if msg != "" {
|
if msg != "" {
|
||||||
return &Code{
|
return &Code{
|
||||||
Message: msg,
|
Message: msg,
|
||||||
@ -322,7 +323,7 @@ func GetOAuthCode(userId string, clientId string, responseType string, redirectU
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetOAuthToken(grantType string, clientId string, clientSecret string, code string, verifier string, scope string, username string, password string, host string, tag string, avatar string) interface{} {
|
func GetOAuthToken(grantType string, clientId string, clientSecret string, code string, verifier string, scope string, username string, password string, host string, tag string, avatar string, lang string) interface{} {
|
||||||
application := GetApplicationByClientId(clientId)
|
application := GetApplicationByClientId(clientId)
|
||||||
if application == nil {
|
if application == nil {
|
||||||
return &TokenError{
|
return &TokenError{
|
||||||
@ -353,7 +354,7 @@ func GetOAuthToken(grantType string, clientId string, clientSecret string, code
|
|||||||
|
|
||||||
if tag == "wechat_miniprogram" {
|
if tag == "wechat_miniprogram" {
|
||||||
// Wechat Mini Program
|
// Wechat Mini Program
|
||||||
token, tokenError = GetWechatMiniProgramToken(application, code, host, username, avatar)
|
token, tokenError = GetWechatMiniProgramToken(application, code, host, username, avatar, lang)
|
||||||
}
|
}
|
||||||
|
|
||||||
if tokenError != nil {
|
if tokenError != nil {
|
||||||
@ -559,7 +560,7 @@ func GetPasswordToken(application *Application, username string, password string
|
|||||||
ErrorDescription: "the user does not exist",
|
ErrorDescription: "the user does not exist",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
msg := CheckPassword(user, password)
|
msg := CheckPassword(user, password, "en")
|
||||||
if msg != "" {
|
if msg != "" {
|
||||||
return nil, &TokenError{
|
return nil, &TokenError{
|
||||||
Error: InvalidGrant,
|
Error: InvalidGrant,
|
||||||
@ -669,7 +670,7 @@ func GetTokenByUser(application *Application, user *User, scope string, host str
|
|||||||
|
|
||||||
// GetWechatMiniProgramToken
|
// GetWechatMiniProgramToken
|
||||||
// Wechat Mini Program flow
|
// Wechat Mini Program flow
|
||||||
func GetWechatMiniProgramToken(application *Application, code string, host string, username string, avatar string) (*Token, *TokenError) {
|
func GetWechatMiniProgramToken(application *Application, code string, host string, username string, avatar string, lang string) (*Token, *TokenError) {
|
||||||
mpProvider := GetWechatMiniProgramProvider(application)
|
mpProvider := GetWechatMiniProgramProvider(application)
|
||||||
if mpProvider == nil {
|
if mpProvider == nil {
|
||||||
return nil, &TokenError{
|
return nil, &TokenError{
|
||||||
@ -703,7 +704,7 @@ func GetWechatMiniProgramToken(application *Application, code string, host strin
|
|||||||
}
|
}
|
||||||
// Add new user
|
// Add new user
|
||||||
var name string
|
var name string
|
||||||
if username != "" {
|
if CheckUsername(username, lang) == "" {
|
||||||
name = username
|
name = username
|
||||||
} else {
|
} else {
|
||||||
name = fmt.Sprintf("wechat-%s", openId)
|
name = fmt.Sprintf("wechat-%s", openId)
|
||||||
|
@ -18,6 +18,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"github.com/casdoor/casdoor/conf"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
"github.com/duo-labs/webauthn/webauthn"
|
"github.com/duo-labs/webauthn/webauthn"
|
||||||
"xorm.io/core"
|
"xorm.io/core"
|
||||||
@ -385,7 +386,7 @@ func UpdateUser(id string, user *User, columns []string, isGlobalAdmin bool) boo
|
|||||||
user.UpdateUserHash()
|
user.UpdateUserHash()
|
||||||
|
|
||||||
if user.Avatar != oldUser.Avatar && user.Avatar != "" && user.PermanentAvatar != "*" {
|
if user.Avatar != oldUser.Avatar && user.Avatar != "" && user.PermanentAvatar != "*" {
|
||||||
user.PermanentAvatar = getPermanentAvatarUrl(user.Owner, user.Name, user.Avatar)
|
user.PermanentAvatar = getPermanentAvatarUrl(user.Owner, user.Name, user.Avatar, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(columns) == 0 {
|
if len(columns) == 0 {
|
||||||
@ -418,7 +419,7 @@ func UpdateUserForAllFields(id string, user *User) bool {
|
|||||||
user.UpdateUserHash()
|
user.UpdateUserHash()
|
||||||
|
|
||||||
if user.Avatar != oldUser.Avatar && user.Avatar != "" {
|
if user.Avatar != oldUser.Avatar && user.Avatar != "" {
|
||||||
user.PermanentAvatar = getPermanentAvatarUrl(user.Owner, user.Name, user.Avatar)
|
user.PermanentAvatar = getPermanentAvatarUrl(user.Owner, user.Name, user.Avatar, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
affected, err := adapter.Engine.ID(core.PK{owner, name}).AllCols().Update(user)
|
affected, err := adapter.Engine.ID(core.PK{owner, name}).AllCols().Update(user)
|
||||||
@ -448,7 +449,7 @@ func AddUser(user *User) bool {
|
|||||||
user.UpdateUserHash()
|
user.UpdateUserHash()
|
||||||
user.PreHash = user.Hash
|
user.PreHash = user.Hash
|
||||||
|
|
||||||
user.PermanentAvatar = getPermanentAvatarUrl(user.Owner, user.Name, user.Avatar)
|
user.PermanentAvatar = getPermanentAvatarUrl(user.Owner, user.Name, user.Avatar, false)
|
||||||
|
|
||||||
user.Ranking = GetUserCount(user.Owner, "", "") + 1
|
user.Ranking = GetUserCount(user.Owner, "", "") + 1
|
||||||
|
|
||||||
@ -473,7 +474,7 @@ func AddUsers(users []*User) bool {
|
|||||||
user.UpdateUserHash()
|
user.UpdateUserHash()
|
||||||
user.PreHash = user.Hash
|
user.PreHash = user.Hash
|
||||||
|
|
||||||
user.PermanentAvatar = getPermanentAvatarUrl(user.Owner, user.Name, user.Avatar)
|
user.PermanentAvatar = getPermanentAvatarUrl(user.Owner, user.Name, user.Avatar, true)
|
||||||
}
|
}
|
||||||
|
|
||||||
affected, err := adapter.Engine.Insert(users)
|
affected, err := adapter.Engine.Insert(users)
|
||||||
@ -487,7 +488,7 @@ func AddUsers(users []*User) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func AddUsersInBatch(users []*User) bool {
|
func AddUsersInBatch(users []*User) bool {
|
||||||
batchSize := 1000
|
batchSize := conf.GetConfigBatchSize()
|
||||||
|
|
||||||
if len(users) == 0 {
|
if len(users) == 0 {
|
||||||
return false
|
return false
|
||||||
@ -521,12 +522,7 @@ func DeleteUser(user *User) bool {
|
|||||||
return affected != 0
|
return affected != 0
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetUserInfo(userId string, scope string, aud string, host string) (*Userinfo, error) {
|
func GetUserInfo(user *User, scope string, aud string, host string) *Userinfo {
|
||||||
user := GetUser(userId)
|
|
||||||
if user == nil {
|
|
||||||
return nil, fmt.Errorf("the user: %s doesn't exist", userId)
|
|
||||||
}
|
|
||||||
|
|
||||||
_, originBackend := getOriginFromHost(host)
|
_, originBackend := getOriginFromHost(host)
|
||||||
|
|
||||||
resp := Userinfo{
|
resp := Userinfo{
|
||||||
@ -548,7 +544,7 @@ func GetUserInfo(userId string, scope string, aud string, host string) (*Userinf
|
|||||||
if strings.Contains(scope, "phone") {
|
if strings.Contains(scope, "phone") {
|
||||||
resp.Phone = user.Phone
|
resp.Phone = user.Phone
|
||||||
}
|
}
|
||||||
return &resp, nil
|
return &resp
|
||||||
}
|
}
|
||||||
|
|
||||||
func LinkUserAccount(user *User, field string, value string) bool {
|
func LinkUserAccount(user *User, field string, value string) bool {
|
||||||
|
@ -17,6 +17,7 @@ package object
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"reflect"
|
"reflect"
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
@ -108,3 +109,24 @@ func TestGetUserByField(t *testing.T) {
|
|||||||
t.Log("no user found")
|
t.Log("no user found")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGetEmailsForUsers(t *testing.T) {
|
||||||
|
InitConfig()
|
||||||
|
|
||||||
|
emailMap := map[string]int{}
|
||||||
|
emails := []string{}
|
||||||
|
users := GetUsers("built-in")
|
||||||
|
for _, user := range users {
|
||||||
|
if user.Email == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, ok := emailMap[user.Email]; !ok {
|
||||||
|
emailMap[user.Email] = 1
|
||||||
|
emails = append(emails, user.Email)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
text := strings.Join(emails, "\n")
|
||||||
|
println(text)
|
||||||
|
}
|
||||||
|
@ -80,7 +80,7 @@ func SetUserField(user *User, field string, value string) bool {
|
|||||||
value = user.Password
|
value = user.Password
|
||||||
}
|
}
|
||||||
|
|
||||||
affected, err := adapter.Engine.Table(user).ID(core.PK{user.Owner, user.Name}).Update(map[string]interface{}{field: value})
|
affected, err := adapter.Engine.Table(user).ID(core.PK{user.Owner, user.Name}).Update(map[string]interface{}{strings.ToLower(field): value})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
@ -137,6 +137,12 @@ func SetUserOAuthProperties(organization *Organization, user *User, providerType
|
|||||||
user.Email = userInfo.Email
|
user.Email = userInfo.Email
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if userInfo.UnionId != "" {
|
||||||
|
propertyName := fmt.Sprintf("oauth_%s_unionId", providerType)
|
||||||
|
setUserProperty(user, propertyName, userInfo.UnionId)
|
||||||
|
}
|
||||||
|
|
||||||
if userInfo.AvatarUrl != "" {
|
if userInfo.AvatarUrl != "" {
|
||||||
propertyName := fmt.Sprintf("oauth_%s_avatarUrl", providerType)
|
propertyName := fmt.Sprintf("oauth_%s_avatarUrl", providerType)
|
||||||
setUserProperty(user, propertyName, userInfo.AvatarUrl)
|
setUserProperty(user, propertyName, userInfo.AvatarUrl)
|
||||||
|
@ -21,6 +21,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/conf"
|
"github.com/casdoor/casdoor/conf"
|
||||||
|
"github.com/casdoor/casdoor/i18n"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
"xorm.io/core"
|
"xorm.io/core"
|
||||||
)
|
)
|
||||||
@ -122,11 +123,11 @@ func getVerificationRecord(dest string) *VerificationRecord {
|
|||||||
return &record
|
return &record
|
||||||
}
|
}
|
||||||
|
|
||||||
func CheckVerificationCode(dest, code string) string {
|
func CheckVerificationCode(dest, code, lang string) string {
|
||||||
record := getVerificationRecord(dest)
|
record := getVerificationRecord(dest)
|
||||||
|
|
||||||
if record == nil {
|
if record == nil {
|
||||||
return "Code has not been sent yet!"
|
return i18n.Translate(lang, "PhoneErr.CodeNotSent")
|
||||||
}
|
}
|
||||||
|
|
||||||
timeout, err := conf.GetConfigInt64("verificationCodeTimeout")
|
timeout, err := conf.GetConfigInt64("verificationCodeTimeout")
|
||||||
@ -136,7 +137,7 @@ func CheckVerificationCode(dest, code string) string {
|
|||||||
|
|
||||||
now := time.Now().Unix()
|
now := time.Now().Unix()
|
||||||
if now-record.Time > timeout*60 {
|
if now-record.Time > timeout*60 {
|
||||||
return fmt.Sprintf("You should verify your code in %d min!", timeout)
|
return fmt.Sprintf(i18n.Translate(lang, "PhoneErr.CodeTimeOut"), timeout)
|
||||||
}
|
}
|
||||||
|
|
||||||
if record.Code != code {
|
if record.Code != code {
|
||||||
@ -159,7 +160,7 @@ func DisableVerificationCode(dest string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// from Casnode/object/validateCode.go line 116
|
// From Casnode/object/validateCode.go line 116
|
||||||
var stdNums = []byte("0123456789")
|
var stdNums = []byte("0123456789")
|
||||||
|
|
||||||
func getRandomCode(length int) string {
|
func getRandomCode(length int) string {
|
||||||
|
@ -20,7 +20,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/astaxie/beego/context"
|
"github.com/beego/beego/context"
|
||||||
"github.com/casdoor/casdoor/authz"
|
"github.com/casdoor/casdoor/authz"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
@ -63,11 +63,16 @@ func getObject(ctx *context.Context) (string, string) {
|
|||||||
if method == http.MethodGet {
|
if method == http.MethodGet {
|
||||||
// query == "?id=built-in/admin"
|
// query == "?id=built-in/admin"
|
||||||
id := ctx.Input.Query("id")
|
id := ctx.Input.Query("id")
|
||||||
if id == "" {
|
if id != "" {
|
||||||
return "", ""
|
return util.GetOwnerAndNameFromId(id)
|
||||||
}
|
}
|
||||||
|
|
||||||
return util.GetOwnerAndNameFromId(id)
|
owner := ctx.Input.Query("owner")
|
||||||
|
if owner != "" {
|
||||||
|
return owner, ""
|
||||||
|
}
|
||||||
|
|
||||||
|
return "", ""
|
||||||
} else {
|
} else {
|
||||||
body := ctx.Input.RequestBody
|
body := ctx.Input.RequestBody
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ package routers
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/astaxie/beego/context"
|
"github.com/beego/beego/context"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
@ -62,7 +62,7 @@ func AutoSigninFilter(ctx *context.Context) {
|
|||||||
password := ctx.Input.Query("password")
|
password := ctx.Input.Query("password")
|
||||||
if userId != "" && password != "" && ctx.Input.Query("grant_type") == "" {
|
if userId != "" && password != "" && ctx.Input.Query("grant_type") == "" {
|
||||||
owner, name := util.GetOwnerAndNameFromId(userId)
|
owner, name := util.GetOwnerAndNameFromId(userId)
|
||||||
_, msg := object.CheckUserPassword(owner, name, password)
|
_, msg := object.CheckUserPassword(owner, name, password, "en")
|
||||||
if msg != "" {
|
if msg != "" {
|
||||||
responseError(ctx, msg)
|
responseError(ctx, msg)
|
||||||
return
|
return
|
||||||
|
@ -18,7 +18,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/astaxie/beego/context"
|
"github.com/beego/beego/context"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
|
@ -17,7 +17,7 @@ package routers
|
|||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/astaxie/beego/context"
|
"github.com/beego/beego/context"
|
||||||
"github.com/casdoor/casdoor/conf"
|
"github.com/casdoor/casdoor/conf"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
)
|
)
|
||||||
|
@ -17,7 +17,7 @@ package routers
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/astaxie/beego/context"
|
"github.com/beego/beego/context"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
package routers
|
package routers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/astaxie/beego"
|
"github.com/beego/beego"
|
||||||
|
|
||||||
"github.com/casdoor/casdoor/controllers"
|
"github.com/casdoor/casdoor/controllers"
|
||||||
)
|
)
|
||||||
@ -60,6 +60,7 @@ func initAPI() {
|
|||||||
beego.Router("/api/update-organization", &controllers.ApiController{}, "POST:UpdateOrganization")
|
beego.Router("/api/update-organization", &controllers.ApiController{}, "POST:UpdateOrganization")
|
||||||
beego.Router("/api/add-organization", &controllers.ApiController{}, "POST:AddOrganization")
|
beego.Router("/api/add-organization", &controllers.ApiController{}, "POST:AddOrganization")
|
||||||
beego.Router("/api/delete-organization", &controllers.ApiController{}, "POST:DeleteOrganization")
|
beego.Router("/api/delete-organization", &controllers.ApiController{}, "POST:DeleteOrganization")
|
||||||
|
beego.Router("/api/get-default-application", &controllers.ApiController{}, "GET:GetDefaultApplication")
|
||||||
|
|
||||||
beego.Router("/api/get-global-users", &controllers.ApiController{}, "GET:GetGlobalUsers")
|
beego.Router("/api/get-global-users", &controllers.ApiController{}, "GET:GetGlobalUsers")
|
||||||
beego.Router("/api/get-users", &controllers.ApiController{}, "GET:GetUsers")
|
beego.Router("/api/get-users", &controllers.ApiController{}, "GET:GetUsers")
|
||||||
@ -96,6 +97,13 @@ func initAPI() {
|
|||||||
beego.Router("/api/add-model", &controllers.ApiController{}, "POST:AddModel")
|
beego.Router("/api/add-model", &controllers.ApiController{}, "POST:AddModel")
|
||||||
beego.Router("/api/delete-model", &controllers.ApiController{}, "POST:DeleteModel")
|
beego.Router("/api/delete-model", &controllers.ApiController{}, "POST:DeleteModel")
|
||||||
|
|
||||||
|
beego.Router("/api/get-adapters", &controllers.ApiController{}, "GET:GetCasbinAdapters")
|
||||||
|
beego.Router("/api/get-adapter", &controllers.ApiController{}, "GET:GetCasbinAdapter")
|
||||||
|
beego.Router("/api/update-adapter", &controllers.ApiController{}, "POST:UpdateCasbinAdapter")
|
||||||
|
beego.Router("/api/add-adapter", &controllers.ApiController{}, "POST:AddCasbinAdapter")
|
||||||
|
beego.Router("/api/delete-adapter", &controllers.ApiController{}, "POST:DeleteCasbinAdapter")
|
||||||
|
beego.Router("/api/sync-policies", &controllers.ApiController{}, "GET:SyncPolicies")
|
||||||
|
|
||||||
beego.Router("/api/set-password", &controllers.ApiController{}, "POST:SetPassword")
|
beego.Router("/api/set-password", &controllers.ApiController{}, "POST:SetPassword")
|
||||||
beego.Router("/api/check-user-password", &controllers.ApiController{}, "POST:CheckUserPassword")
|
beego.Router("/api/check-user-password", &controllers.ApiController{}, "POST:CheckUserPassword")
|
||||||
beego.Router("/api/get-email-and-phone", &controllers.ApiController{}, "POST:GetEmailAndPhone")
|
beego.Router("/api/get-email-and-phone", &controllers.ApiController{}, "POST:GetEmailAndPhone")
|
||||||
@ -147,6 +155,7 @@ func initAPI() {
|
|||||||
|
|
||||||
beego.Router("/api/get-records", &controllers.ApiController{}, "GET:GetRecords")
|
beego.Router("/api/get-records", &controllers.ApiController{}, "GET:GetRecords")
|
||||||
beego.Router("/api/get-records-filter", &controllers.ApiController{}, "POST:GetRecordsByFilter")
|
beego.Router("/api/get-records-filter", &controllers.ApiController{}, "POST:GetRecordsByFilter")
|
||||||
|
beego.Router("/api/add-record", &controllers.ApiController{}, "POST:AddRecord")
|
||||||
|
|
||||||
beego.Router("/api/get-webhooks", &controllers.ApiController{}, "GET:GetWebhooks")
|
beego.Router("/api/get-webhooks", &controllers.ApiController{}, "GET:GetWebhooks")
|
||||||
beego.Router("/api/get-webhook", &controllers.ApiController{}, "GET:GetWebhook")
|
beego.Router("/api/get-webhook", &controllers.ApiController{}, "GET:GetWebhook")
|
||||||
|
@ -19,7 +19,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/astaxie/beego/context"
|
"github.com/beego/beego/context"
|
||||||
"github.com/casdoor/casdoor/conf"
|
"github.com/casdoor/casdoor/conf"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
|
@ -19,8 +19,8 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/astaxie/beego/context"
|
"github.com/beego/beego/context"
|
||||||
"github.com/astaxie/beego/logs"
|
"github.com/beego/beego/logs"
|
||||||
)
|
)
|
||||||
|
|
||||||
func GetIPInfo(clientIP string) string {
|
func GetIPInfo(clientIP string) string {
|
||||||
|
@ -17,7 +17,7 @@ package util
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/astaxie/beego/logs"
|
"github.com/beego/beego/logs"
|
||||||
)
|
)
|
||||||
|
|
||||||
func SafeGoroutine(fn func()) {
|
func SafeGoroutine(fn func()) {
|
@ -43,7 +43,7 @@ module.exports = {
|
|||||||
options: {
|
options: {
|
||||||
lessLoaderOptions: {
|
lessLoaderOptions: {
|
||||||
lessOptions: {
|
lessOptions: {
|
||||||
modifyVars: {"@primary-color": "rgb(45,120,213)"},
|
modifyVars: {"@primary-color": "rgb(89,54,213)", "@border-radius-base": "5px"},
|
||||||
javascriptEnabled: true,
|
javascriptEnabled: true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -70,6 +70,7 @@
|
|||||||
"eslint-plugin-react": "^7.31.1",
|
"eslint-plugin-react": "^7.31.1",
|
||||||
"husky": "^4.3.8",
|
"husky": "^4.3.8",
|
||||||
"lint-staged": "^13.0.3",
|
"lint-staged": "^13.0.3",
|
||||||
|
"path-browserify": "^1.0.1",
|
||||||
"stylelint": "^14.11.0",
|
"stylelint": "^14.11.0",
|
||||||
"stylelint-config-recommended-less": "^1.0.4",
|
"stylelint-config-recommended-less": "^1.0.4",
|
||||||
"stylelint-config-standard": "^28.0.0"
|
"stylelint-config-standard": "^28.0.0"
|
||||||
|
412
web/src/AdapterEditPage.js
Normal file
412
web/src/AdapterEditPage.js
Normal file
@ -0,0 +1,412 @@
|
|||||||
|
// Copyright 2022 The Casdoor Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// 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.
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
import {Button, Card, Col, Input, InputNumber, Row, Select, Switch, Table, Tooltip} from "antd";
|
||||||
|
import * as AdapterBackend from "./backend/AdapterBackend";
|
||||||
|
import * as OrganizationBackend from "./backend/OrganizationBackend";
|
||||||
|
import * as Setting from "./Setting";
|
||||||
|
import i18next from "i18next";
|
||||||
|
|
||||||
|
import "codemirror/lib/codemirror.css";
|
||||||
|
import * as ModelBackend from "./backend/ModelBackend";
|
||||||
|
import {EditOutlined, MinusOutlined} from "@ant-design/icons";
|
||||||
|
require("codemirror/theme/material-darker.css");
|
||||||
|
require("codemirror/mode/javascript/javascript");
|
||||||
|
|
||||||
|
const {Option} = Select;
|
||||||
|
|
||||||
|
class AdapterEditPage extends React.Component {
|
||||||
|
constructor(props) {
|
||||||
|
super(props);
|
||||||
|
this.state = {
|
||||||
|
classes: props,
|
||||||
|
organizationName: props.organizationName !== undefined ? props.organizationName : props.match.params.organizationName,
|
||||||
|
adapterName: props.match.params.adapterName,
|
||||||
|
adapter: null,
|
||||||
|
organizations: [],
|
||||||
|
models: [],
|
||||||
|
policyLists: [],
|
||||||
|
mode: props.location.mode !== undefined ? props.location.mode : "edit",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
UNSAFE_componentWillMount() {
|
||||||
|
this.getAdapter();
|
||||||
|
this.getOrganizations();
|
||||||
|
}
|
||||||
|
|
||||||
|
getAdapter() {
|
||||||
|
AdapterBackend.getAdapter(this.state.organizationName, this.state.adapterName)
|
||||||
|
.then((adapter) => {
|
||||||
|
this.setState({
|
||||||
|
adapter: adapter,
|
||||||
|
});
|
||||||
|
|
||||||
|
this.getModels(adapter.owner);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
getOrganizations() {
|
||||||
|
OrganizationBackend.getOrganizations(this.state.organizationName)
|
||||||
|
.then((res) => {
|
||||||
|
this.setState({
|
||||||
|
organizations: (res.msg === undefined) ? res : [],
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
getModels(organizationName) {
|
||||||
|
ModelBackend.getModels(organizationName)
|
||||||
|
.then((res) => {
|
||||||
|
this.setState({
|
||||||
|
models: res,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
parseAdapterField(key, value) {
|
||||||
|
if (["port"].includes(key)) {
|
||||||
|
value = Setting.myParseInt(value);
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
updateAdapterField(key, value) {
|
||||||
|
value = this.parseAdapterField(key, value);
|
||||||
|
|
||||||
|
const adapter = this.state.adapter;
|
||||||
|
adapter[key] = value;
|
||||||
|
this.setState({
|
||||||
|
adapter: adapter,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
synPolicies() {
|
||||||
|
this.setState({loading: true});
|
||||||
|
AdapterBackend.syncPolicies(this.state.adapter.owner, this.state.adapter.name)
|
||||||
|
.then((res) => {
|
||||||
|
this.setState({loading: false, policyLists: res});
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
this.setState({loading: false});
|
||||||
|
Setting.showMessage("error", `Adapter failed to get policies: ${error}`);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
renderTable(table) {
|
||||||
|
const columns = [
|
||||||
|
{
|
||||||
|
title: "Rule Type",
|
||||||
|
dataIndex: "PType",
|
||||||
|
key: "PType",
|
||||||
|
width: "100px",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "V0",
|
||||||
|
dataIndex: "V0",
|
||||||
|
key: "V0",
|
||||||
|
width: "100px",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "V1",
|
||||||
|
dataIndex: "V1",
|
||||||
|
key: "V1",
|
||||||
|
width: "100px",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "V2",
|
||||||
|
dataIndex: "V2",
|
||||||
|
key: "V2",
|
||||||
|
width: "100px",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "V3",
|
||||||
|
dataIndex: "V3",
|
||||||
|
key: "V3",
|
||||||
|
width: "100px",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "V4",
|
||||||
|
dataIndex: "V4",
|
||||||
|
key: "V4",
|
||||||
|
width: "100px",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "V5",
|
||||||
|
dataIndex: "V5",
|
||||||
|
key: "V5",
|
||||||
|
width: "100px",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "Option",
|
||||||
|
key: "option",
|
||||||
|
width: "100px",
|
||||||
|
render: (text, record, index) => {
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<Tooltip placement="topLeft" title="Edit">
|
||||||
|
<Button style={{marginRight: "0.5rem"}} icon={<EditOutlined />} size="small" />
|
||||||
|
</Tooltip>
|
||||||
|
<Tooltip placement="topLeft" title="Delete">
|
||||||
|
<Button icon={<MinusOutlined />} size="small" />
|
||||||
|
</Tooltip>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
}];
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<Table
|
||||||
|
pagination={{
|
||||||
|
defaultPageSize: 10,
|
||||||
|
}}
|
||||||
|
columns={columns} dataSource={table} rowKey="name" size="middle" bordered
|
||||||
|
loading={this.state.loading}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
renderAdapter() {
|
||||||
|
return (
|
||||||
|
<Card size="small" title={
|
||||||
|
<div>
|
||||||
|
{this.state.mode === "add" ? i18next.t("adapter:New Adapter") : i18next.t("adapter:Edit Adapter")}
|
||||||
|
<Button onClick={() => this.submitAdapterEdit(false)}>{i18next.t("general:Save")}</Button>
|
||||||
|
<Button style={{marginLeft: "20px"}} type="primary" onClick={() => this.submitAdapterEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
|
||||||
|
{this.state.mode === "add" ? <Button style={{marginLeft: "20px"}} onClick={() => this.deleteAdapter()}>{i18next.t("general:Cancel")}</Button> : null}
|
||||||
|
</div>
|
||||||
|
} style={(Setting.isMobile()) ? {margin: "5px"} : {}} type="inner">
|
||||||
|
<Row style={{marginTop: "10px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||||
|
{Setting.getLabel(i18next.t("general:Organization"), i18next.t("general:Organization - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={22} >
|
||||||
|
<Select virtual={false} style={{width: "100%"}} value={this.state.adapter.organization} onChange={(value => {this.updateadapterField("organization", value);})}>
|
||||||
|
{
|
||||||
|
this.state.organizations.map((organization, index) => <Option key={index} value={organization.name}>{organization.name}</Option>)
|
||||||
|
}
|
||||||
|
</Select>
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||||
|
{Setting.getLabel(i18next.t("general:Name"), i18next.t("general:Name - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={22} >
|
||||||
|
<Input value={this.state.adapter.name} onChange={e => {
|
||||||
|
this.updateAdapterField("name", e.target.value);
|
||||||
|
}} />
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||||
|
{Setting.getLabel(i18next.t("provider:Type"), i18next.t("provider:Type - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={22} >
|
||||||
|
<Select virtual={false} style={{width: "100%"}} value={this.state.adapter.type} onChange={(value => {
|
||||||
|
this.updateAdapterField("type", value);
|
||||||
|
const adapter = this.state.adapter;
|
||||||
|
// adapter["tableColumns"] = Setting.getAdapterTableColumns(this.state.adapter);
|
||||||
|
this.setState({
|
||||||
|
adapter: adapter,
|
||||||
|
});
|
||||||
|
})}>
|
||||||
|
{
|
||||||
|
["Database"]
|
||||||
|
.map((item, index) => <Option key={index} value={item}>{item}</Option>)
|
||||||
|
}
|
||||||
|
</Select>
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||||
|
{Setting.getLabel(i18next.t("provider:Host"), i18next.t("provider:Host - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={22} >
|
||||||
|
<Input value={this.state.adapter.host} onChange={e => {
|
||||||
|
this.updateAdapterField("host", e.target.value);
|
||||||
|
}} />
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||||
|
{Setting.getLabel(i18next.t("provider:Port"), i18next.t("provider:Port - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={22} >
|
||||||
|
<InputNumber value={this.state.adapter.port} onChange={value => {
|
||||||
|
this.updateAdapterField("port", value);
|
||||||
|
}} />
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||||
|
{Setting.getLabel(i18next.t("general:User"), i18next.t("general:User - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={22} >
|
||||||
|
<Input value={this.state.adapter.user} onChange={e => {
|
||||||
|
this.updateAdapterField("user", e.target.value);
|
||||||
|
}} />
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||||
|
{Setting.getLabel(i18next.t("general:Password"), i18next.t("general:Password - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={22} >
|
||||||
|
<Input value={this.state.adapter.password} onChange={e => {
|
||||||
|
this.updateAdapterField("password", e.target.value);
|
||||||
|
}} />
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||||
|
{Setting.getLabel(i18next.t("syncer:Database type"), i18next.t("syncer:Database type - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={22} >
|
||||||
|
<Select virtual={false} style={{width: "100%"}} value={this.state.adapter.databaseType} onChange={(value => {this.updateAdapterField("databaseType", value);})}>
|
||||||
|
{
|
||||||
|
[
|
||||||
|
{id: "mysql", name: "MySQL"},
|
||||||
|
{id: "postgres", name: "PostgreSQL"},
|
||||||
|
{id: "mssql", name: "SQL Server"},
|
||||||
|
{id: "oracle", name: "Oracle"},
|
||||||
|
{id: "sqlite3", name: "Sqlite 3"},
|
||||||
|
].map((databaseType, index) => <Option key={index} value={databaseType.id}>{databaseType.name}</Option>)
|
||||||
|
}
|
||||||
|
</Select>
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||||
|
{Setting.getLabel(i18next.t("syncer:Database"), i18next.t("syncer:Database - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={22} >
|
||||||
|
<Input value={this.state.adapter.database} onChange={e => {
|
||||||
|
this.updateAdapterField("database", e.target.value);
|
||||||
|
}} />
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||||
|
{Setting.getLabel(i18next.t("syncer:Table"), i18next.t("syncer:Table - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={22} >
|
||||||
|
<Input value={this.state.adapter.table}
|
||||||
|
disabled={this.state.adapter.type === "Keycloak"} onChange={e => {
|
||||||
|
this.updateAdapterField("table", e.target.value);
|
||||||
|
}} />
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||||
|
{Setting.getLabel(i18next.t("general:Model"), i18next.t("general:Model - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={22} >
|
||||||
|
<Select virtual={false} style={{width: "100%"}} value={this.state.adapter.model} onChange={(model => {
|
||||||
|
this.updateAdapterField("model", model);
|
||||||
|
})}>
|
||||||
|
{
|
||||||
|
this.state.models.map((model, index) => <Option key={index} value={model.name}>{model.name}</Option>)
|
||||||
|
}
|
||||||
|
</Select>
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||||
|
{Setting.getLabel(i18next.t("adapter:Policies"), i18next.t("adapter:Policies - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={2}>
|
||||||
|
<Button type="primary" onClick={() => {this.synPolicies();}}>
|
||||||
|
{i18next.t("adapter:Sync")}
|
||||||
|
</Button>
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||||
|
</Col>
|
||||||
|
<Col span={22} >
|
||||||
|
{
|
||||||
|
this.renderTable(this.state.policyLists)
|
||||||
|
}
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 19 : 2}>
|
||||||
|
{Setting.getLabel(i18next.t("general:Is enabled"), i18next.t("general:Is enabled - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={1} >
|
||||||
|
<Switch checked={this.state.adapter.isEnabled} onChange={checked => {
|
||||||
|
this.updateAdapterField("isEnabled", checked);
|
||||||
|
}} />
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
submitAdapterEdit(willExist) {
|
||||||
|
const adapter = Setting.deepCopy(this.state.adapter);
|
||||||
|
AdapterBackend.updateAdapter(this.state.adapter.owner, this.state.adapterName, adapter)
|
||||||
|
.then((res) => {
|
||||||
|
if (res.msg === "") {
|
||||||
|
Setting.showMessage("success", "Successfully saved");
|
||||||
|
this.setState({
|
||||||
|
adapterName: this.state.adapter.name,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (willExist) {
|
||||||
|
this.props.history.push("/adapters");
|
||||||
|
} else {
|
||||||
|
this.props.history.push(`/adapters/${this.state.adapter.name}`);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Setting.showMessage("error", res.msg);
|
||||||
|
this.updateAdapterField("name", this.state.adapterName);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
Setting.showMessage("error", `Failed to connect to server: ${error}`);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
deleteAdapter() {
|
||||||
|
AdapterBackend.deleteAdapter(this.state.adapter)
|
||||||
|
.then(() => {
|
||||||
|
this.props.history.push("/adapters");
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
Setting.showMessage("error", `adapter failed to delete: ${error}`);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
{
|
||||||
|
this.state.adapter !== null ? this.renderAdapter() : null
|
||||||
|
}
|
||||||
|
<div style={{marginTop: "20px", marginLeft: "40px"}}>
|
||||||
|
<Button size="large" onClick={() => this.submitAdapterEdit(false)}>{i18next.t("general:Save")}</Button>
|
||||||
|
<Button style={{marginLeft: "20px"}} type="primary" size="large" onClick={() => this.submitAdapterEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
|
||||||
|
{this.state.mode === "add" ? <Button style={{marginLeft: "20px"}} size="large" onClick={() => this.deleteAdapter()}>{i18next.t("general:Cancel")}</Button> : null}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default AdapterEditPage;
|
261
web/src/AdapterListPage.js
Normal file
261
web/src/AdapterListPage.js
Normal file
@ -0,0 +1,261 @@
|
|||||||
|
// Copyright 2022 The Casdoor Authors. All Rights Reserved.
|
||||||
|
//
|
||||||
|
// 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.
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
import {Link} from "react-router-dom";
|
||||||
|
import {Button, Popconfirm, Switch, Table} from "antd";
|
||||||
|
import moment from "moment";
|
||||||
|
import * as Setting from "./Setting";
|
||||||
|
import * as AdapterBackend from "./backend/AdapterBackend";
|
||||||
|
import i18next from "i18next";
|
||||||
|
import BaseListPage from "./BaseListPage";
|
||||||
|
|
||||||
|
class AdapterListPage extends BaseListPage {
|
||||||
|
newAdapter() {
|
||||||
|
const randomName = Setting.getRandomName();
|
||||||
|
return {
|
||||||
|
owner: "built-in",
|
||||||
|
name: `adapter_${randomName}`,
|
||||||
|
createdTime: moment().format(),
|
||||||
|
organization: "built-in",
|
||||||
|
type: "Database",
|
||||||
|
host: "localhost",
|
||||||
|
port: 3306,
|
||||||
|
user: "root",
|
||||||
|
password: "123456",
|
||||||
|
databaseType: "mysql",
|
||||||
|
database: "dbName",
|
||||||
|
table: "tableName",
|
||||||
|
isEnabled: false,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
addAdapter() {
|
||||||
|
const newAdapter = this.newAdapter();
|
||||||
|
AdapterBackend.addAdapter(newAdapter)
|
||||||
|
.then((res) => {
|
||||||
|
this.props.history.push({pathname: `/adapters/${newAdapter.owner}/${newAdapter.name}`, mode: "add"});
|
||||||
|
}
|
||||||
|
)
|
||||||
|
.catch(error => {
|
||||||
|
Setting.showMessage("error", `Adapter failed to add: ${error}`);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
deleteAdapter(i) {
|
||||||
|
AdapterBackend.deleteAdapter(this.state.data[i])
|
||||||
|
.then((res) => {
|
||||||
|
Setting.showMessage("success", "Adapter deleted successfully");
|
||||||
|
this.setState({
|
||||||
|
data: Setting.deleteRow(this.state.data, i),
|
||||||
|
pagination: {total: this.state.pagination.total - 1},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
)
|
||||||
|
.catch(error => {
|
||||||
|
Setting.showMessage("error", `Adapter failed to delete: ${error}`);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
renderTable(adapters) {
|
||||||
|
const columns = [
|
||||||
|
{
|
||||||
|
title: i18next.t("general:Organization"),
|
||||||
|
dataIndex: "organization",
|
||||||
|
key: "organization",
|
||||||
|
width: "120px",
|
||||||
|
sorter: true,
|
||||||
|
...this.getColumnSearchProps("organization"),
|
||||||
|
render: (text, record, index) => {
|
||||||
|
return (
|
||||||
|
<Link to={`/organizations/${text}`}>
|
||||||
|
{text}
|
||||||
|
</Link>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: i18next.t("general:Name"),
|
||||||
|
dataIndex: "name",
|
||||||
|
key: "name",
|
||||||
|
width: "150px",
|
||||||
|
fixed: "left",
|
||||||
|
sorter: true,
|
||||||
|
...this.getColumnSearchProps("name"),
|
||||||
|
render: (text, record, index) => {
|
||||||
|
return (
|
||||||
|
<Link to={`/adapters/${text}`}>
|
||||||
|
{text}
|
||||||
|
</Link>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: i18next.t("general:Created time"),
|
||||||
|
dataIndex: "createdTime",
|
||||||
|
key: "createdTime",
|
||||||
|
width: "160px",
|
||||||
|
sorter: true,
|
||||||
|
render: (text, record, index) => {
|
||||||
|
return Setting.getFormattedDate(text);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: i18next.t("provider:Type"),
|
||||||
|
dataIndex: "type",
|
||||||
|
key: "type",
|
||||||
|
width: "100px",
|
||||||
|
sorter: true,
|
||||||
|
filterMultiple: false,
|
||||||
|
filters: [
|
||||||
|
{text: "Database", value: "Database"},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: i18next.t("provider:Host"),
|
||||||
|
dataIndex: "host",
|
||||||
|
key: "host",
|
||||||
|
width: "120px",
|
||||||
|
sorter: true,
|
||||||
|
...this.getColumnSearchProps("host"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: i18next.t("provider:Port"),
|
||||||
|
dataIndex: "port",
|
||||||
|
key: "port",
|
||||||
|
width: "100px",
|
||||||
|
sorter: true,
|
||||||
|
...this.getColumnSearchProps("port"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: i18next.t("general:User"),
|
||||||
|
dataIndex: "user",
|
||||||
|
key: "user",
|
||||||
|
width: "120px",
|
||||||
|
sorter: true,
|
||||||
|
...this.getColumnSearchProps("user"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: i18next.t("general:Password"),
|
||||||
|
dataIndex: "password",
|
||||||
|
key: "password",
|
||||||
|
width: "120px",
|
||||||
|
sorter: true,
|
||||||
|
...this.getColumnSearchProps("password"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: i18next.t("syncer:Database type"),
|
||||||
|
dataIndex: "databaseType",
|
||||||
|
key: "databaseType",
|
||||||
|
width: "120px",
|
||||||
|
sorter: (a, b) => a.databaseType.localeCompare(b.databaseType),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: i18next.t("syncer:Database"),
|
||||||
|
dataIndex: "database",
|
||||||
|
key: "database",
|
||||||
|
width: "120px",
|
||||||
|
sorter: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: i18next.t("syncer:Table"),
|
||||||
|
dataIndex: "table",
|
||||||
|
key: "table",
|
||||||
|
width: "120px",
|
||||||
|
sorter: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: i18next.t("general:Is enabled"),
|
||||||
|
dataIndex: "isEnabled",
|
||||||
|
key: "isEnabled",
|
||||||
|
width: "120px",
|
||||||
|
sorter: true,
|
||||||
|
render: (text, record, index) => {
|
||||||
|
return (
|
||||||
|
<Switch disabled checkedChildren="ON" unCheckedChildren="OFF" checked={text} />
|
||||||
|
);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: i18next.t("general:Action"),
|
||||||
|
dataIndex: "",
|
||||||
|
key: "op",
|
||||||
|
width: "170px",
|
||||||
|
fixed: (Setting.isMobile()) ? "false" : "right",
|
||||||
|
render: (text, record, index) => {
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<Button style={{marginTop: "10px", marginBottom: "10px", marginRight: "10px"}} type="primary" onClick={() => this.props.history.push(`/adapters/${record.owner}/${record.name}`)}>{i18next.t("general:Edit")}</Button>
|
||||||
|
<Popconfirm
|
||||||
|
title={`Sure to delete adapter: ${record.name} ?`}
|
||||||
|
onConfirm={() => this.deleteAdapter(index)}
|
||||||
|
>
|
||||||
|
<Button style={{marginBottom: "10px"}} type="danger">{i18next.t("general:Delete")}</Button>
|
||||||
|
</Popconfirm>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
const paginationProps = {
|
||||||
|
total: this.state.pagination.total,
|
||||||
|
showQuickJumper: true,
|
||||||
|
showSizeChanger: true,
|
||||||
|
showTotal: () => i18next.t("general:{total} in total").replace("{total}", this.state.pagination.total),
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<Table scroll={{x: "max-content"}} columns={columns} dataSource={adapters} rowKey="name" size="middle" bordered pagination={paginationProps}
|
||||||
|
title={() => (
|
||||||
|
<div>
|
||||||
|
{i18next.t("general:Adapters")}
|
||||||
|
<Button type="primary" size="small" onClick={this.addAdapter.bind(this)}>{i18next.t("general:Add")}</Button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
loading={this.state.loading}
|
||||||
|
onChange={this.handleTableChange}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
fetch = (params = {}) => {
|
||||||
|
let field = params.searchedColumn, value = params.searchText;
|
||||||
|
const sortField = params.sortField, sortOrder = params.sortOrder;
|
||||||
|
if (params.type !== undefined && params.type !== null) {
|
||||||
|
field = "type";
|
||||||
|
value = params.type;
|
||||||
|
}
|
||||||
|
this.setState({loading: true});
|
||||||
|
AdapterBackend.getAdapters("", params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)
|
||||||
|
.then((res) => {
|
||||||
|
if (res.status === "ok") {
|
||||||
|
this.setState({
|
||||||
|
loading: false,
|
||||||
|
data: res.data,
|
||||||
|
pagination: {
|
||||||
|
...params.pagination,
|
||||||
|
total: res.data2,
|
||||||
|
},
|
||||||
|
searchText: params.searchText,
|
||||||
|
searchedColumn: params.searchedColumn,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export default AdapterListPage;
|
139
web/src/App.js
139
web/src/App.js
@ -16,8 +16,8 @@ import React, {Component} from "react";
|
|||||||
import "./App.less";
|
import "./App.less";
|
||||||
import {Helmet} from "react-helmet";
|
import {Helmet} from "react-helmet";
|
||||||
import * as Setting from "./Setting";
|
import * as Setting from "./Setting";
|
||||||
import {DownOutlined, LogoutOutlined, SettingOutlined} from "@ant-design/icons";
|
import {BarsOutlined, DownOutlined, LogoutOutlined, SettingOutlined} from "@ant-design/icons";
|
||||||
import {Avatar, BackTop, Button, Card, Dropdown, Layout, Menu, Result} from "antd";
|
import {Avatar, BackTop, Button, Card, Drawer, Dropdown, Layout, Menu, Result} from "antd";
|
||||||
import {Link, Redirect, Route, Switch, withRouter} from "react-router-dom";
|
import {Link, Redirect, Route, Switch, withRouter} from "react-router-dom";
|
||||||
import OrganizationListPage from "./OrganizationListPage";
|
import OrganizationListPage from "./OrganizationListPage";
|
||||||
import OrganizationEditPage from "./OrganizationEditPage";
|
import OrganizationEditPage from "./OrganizationEditPage";
|
||||||
@ -72,6 +72,9 @@ import CasLogout from "./auth/CasLogout";
|
|||||||
import ModelListPage from "./ModelListPage";
|
import ModelListPage from "./ModelListPage";
|
||||||
import ModelEditPage from "./ModelEditPage";
|
import ModelEditPage from "./ModelEditPage";
|
||||||
import SystemInfo from "./SystemInfo";
|
import SystemInfo from "./SystemInfo";
|
||||||
|
import AdapterListPage from "./AdapterListPage";
|
||||||
|
import AdapterEditPage from "./AdapterEditPage";
|
||||||
|
import {withTranslation} from "react-i18next";
|
||||||
|
|
||||||
const {Header, Footer} = Layout;
|
const {Header, Footer} = Layout;
|
||||||
|
|
||||||
@ -83,6 +86,7 @@ class App extends Component {
|
|||||||
selectedMenuKey: 0,
|
selectedMenuKey: 0,
|
||||||
account: undefined,
|
account: undefined,
|
||||||
uri: null,
|
uri: null,
|
||||||
|
menuVisible: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
Setting.initServerUrl();
|
Setting.initServerUrl();
|
||||||
@ -123,6 +127,8 @@ class App extends Component {
|
|||||||
this.setState({selectedMenuKey: "/permissions"});
|
this.setState({selectedMenuKey: "/permissions"});
|
||||||
} else if (uri.includes("/models")) {
|
} else if (uri.includes("/models")) {
|
||||||
this.setState({selectedMenuKey: "/models"});
|
this.setState({selectedMenuKey: "/models"});
|
||||||
|
} else if (uri.includes("/adapters")) {
|
||||||
|
this.setState({selectedMenuKey: "/adapters"});
|
||||||
} else if (uri.includes("/providers")) {
|
} else if (uri.includes("/providers")) {
|
||||||
this.setState({selectedMenuKey: "/providers"});
|
this.setState({selectedMenuKey: "/providers"});
|
||||||
} else if (uri.includes("/applications")) {
|
} else if (uri.includes("/applications")) {
|
||||||
@ -215,10 +221,9 @@ class App extends Component {
|
|||||||
if (res.status === "ok") {
|
if (res.status === "ok") {
|
||||||
account = res.data;
|
account = res.data;
|
||||||
account.organization = res.data2;
|
account.organization = res.data2;
|
||||||
|
|
||||||
this.setLanguage(account);
|
this.setLanguage(account);
|
||||||
} else {
|
} else {
|
||||||
if (res.msg !== "Please sign in first") {
|
if (res.data !== "Please login first") {
|
||||||
Setting.showMessage("error", `Failed to sign in: ${res.msg}`);
|
Setting.showMessage("error", `Failed to sign in: ${res.msg}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -294,12 +299,12 @@ class App extends Component {
|
|||||||
<Menu onClick={this.handleRightDropdownClick.bind(this)}>
|
<Menu onClick={this.handleRightDropdownClick.bind(this)}>
|
||||||
<Menu.Item key="/account">
|
<Menu.Item key="/account">
|
||||||
<SettingOutlined />
|
<SettingOutlined />
|
||||||
|
|
||||||
{i18next.t("account:My Account")}
|
{i18next.t("account:My Account")}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item key="/logout">
|
<Menu.Item key="/logout">
|
||||||
<LogoutOutlined />
|
<LogoutOutlined />
|
||||||
|
|
||||||
{i18next.t("account:Logout")}
|
{i18next.t("account:Logout")}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
</Menu>
|
</Menu>
|
||||||
@ -374,6 +379,9 @@ class App extends Component {
|
|||||||
</Link>
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Setting.isLocalAdminUser(this.state.account)) {
|
||||||
res.push(
|
res.push(
|
||||||
<Menu.Item key="/users">
|
<Menu.Item key="/users">
|
||||||
<Link to="/users">
|
<Link to="/users">
|
||||||
@ -388,16 +396,15 @@ class App extends Component {
|
|||||||
</Link>
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
);
|
);
|
||||||
|
res.push(
|
||||||
|
<Menu.Item key="/permissions">
|
||||||
|
<Link to="/permissions">
|
||||||
|
{i18next.t("general:Permissions")}
|
||||||
|
</Link>
|
||||||
|
</Menu.Item>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
res.push(
|
|
||||||
<Menu.Item key="/permissions">
|
|
||||||
<Link to="/permissions">
|
|
||||||
{i18next.t("general:Permissions")}
|
|
||||||
</Link>
|
|
||||||
</Menu.Item>
|
|
||||||
);
|
|
||||||
|
|
||||||
if (Setting.isAdminUser(this.state.account)) {
|
if (Setting.isAdminUser(this.state.account)) {
|
||||||
res.push(
|
res.push(
|
||||||
<Menu.Item key="/models">
|
<Menu.Item key="/models">
|
||||||
@ -406,6 +413,13 @@ class App extends Component {
|
|||||||
</Link>
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
);
|
);
|
||||||
|
res.push(
|
||||||
|
<Menu.Item key="/adapters">
|
||||||
|
<Link to="/adapters">
|
||||||
|
{i18next.t("general:Adapters")}
|
||||||
|
</Link>
|
||||||
|
</Menu.Item>
|
||||||
|
);
|
||||||
res.push(
|
res.push(
|
||||||
<Menu.Item key="/providers">
|
<Menu.Item key="/providers">
|
||||||
<Link to="/providers">
|
<Link to="/providers">
|
||||||
@ -422,7 +436,7 @@ class App extends Component {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Setting.isAdminUser(this.state.account)) {
|
if (Setting.isLocalAdminUser(this.state.account)) {
|
||||||
res.push(
|
res.push(
|
||||||
<Menu.Item key="/resources">
|
<Menu.Item key="/resources">
|
||||||
<Link to="/resources">
|
<Link to="/resources">
|
||||||
@ -430,13 +444,6 @@ class App extends Component {
|
|||||||
</Link>
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
);
|
);
|
||||||
res.push(
|
|
||||||
<Menu.Item key="/tokens">
|
|
||||||
<Link to="/tokens">
|
|
||||||
{i18next.t("general:Tokens")}
|
|
||||||
</Link>
|
|
||||||
</Menu.Item>
|
|
||||||
);
|
|
||||||
res.push(
|
res.push(
|
||||||
<Menu.Item key="/records">
|
<Menu.Item key="/records">
|
||||||
<Link to="/records">
|
<Link to="/records">
|
||||||
@ -444,6 +451,16 @@ class App extends Component {
|
|||||||
</Link>
|
</Link>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Setting.isAdminUser(this.state.account)) {
|
||||||
|
res.push(
|
||||||
|
<Menu.Item key="/tokens">
|
||||||
|
<Link to="/tokens">
|
||||||
|
{i18next.t("general:Tokens")}
|
||||||
|
</Link>
|
||||||
|
</Menu.Item>
|
||||||
|
);
|
||||||
res.push(
|
res.push(
|
||||||
<Menu.Item key="/webhooks">
|
<Menu.Item key="/webhooks">
|
||||||
<Link to="/webhooks">
|
<Link to="/webhooks">
|
||||||
@ -545,6 +562,8 @@ class App extends Component {
|
|||||||
<Route exact path="/permissions/:organizationName/:permissionName" render={(props) => this.renderLoginIfNotLoggedIn(<PermissionEditPage account={this.state.account} {...props} />)} />
|
<Route exact path="/permissions/:organizationName/:permissionName" render={(props) => this.renderLoginIfNotLoggedIn(<PermissionEditPage account={this.state.account} {...props} />)} />
|
||||||
<Route exact path="/models" render={(props) => this.renderLoginIfNotLoggedIn(<ModelListPage account={this.state.account} {...props} />)} />
|
<Route exact path="/models" render={(props) => this.renderLoginIfNotLoggedIn(<ModelListPage account={this.state.account} {...props} />)} />
|
||||||
<Route exact path="/models/:organizationName/:modelName" render={(props) => this.renderLoginIfNotLoggedIn(<ModelEditPage account={this.state.account} {...props} />)} />
|
<Route exact path="/models/:organizationName/:modelName" render={(props) => this.renderLoginIfNotLoggedIn(<ModelEditPage account={this.state.account} {...props} />)} />
|
||||||
|
<Route exact path="/adapters" render={(props) => this.renderLoginIfNotLoggedIn(<AdapterListPage account={this.state.account} {...props} />)} />
|
||||||
|
<Route exact path="/adapters/:organizationName/:adapterName" render={(props) => this.renderLoginIfNotLoggedIn(<AdapterEditPage account={this.state.account} {...props} />)} />
|
||||||
<Route exact path="/providers" render={(props) => this.renderLoginIfNotLoggedIn(<ProviderListPage account={this.state.account} {...props} />)} />
|
<Route exact path="/providers" render={(props) => this.renderLoginIfNotLoggedIn(<ProviderListPage account={this.state.account} {...props} />)} />
|
||||||
<Route exact path="/providers/:providerName" render={(props) => this.renderLoginIfNotLoggedIn(<ProviderEditPage account={this.state.account} {...props} />)} />
|
<Route exact path="/providers/:providerName" render={(props) => this.renderLoginIfNotLoggedIn(<ProviderEditPage account={this.state.account} {...props} />)} />
|
||||||
<Route exact path="/applications" render={(props) => this.renderLoginIfNotLoggedIn(<ApplicationListPage account={this.state.account} {...props} />)} />
|
<Route exact path="/applications" render={(props) => this.renderLoginIfNotLoggedIn(<ApplicationListPage account={this.state.account} {...props} />)} />
|
||||||
@ -577,6 +596,18 @@ class App extends Component {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onClose = () => {
|
||||||
|
this.setState({
|
||||||
|
menuVisible: false,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
showMenu = () => {
|
||||||
|
this.setState({
|
||||||
|
menuVisible: true,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
renderContent() {
|
renderContent() {
|
||||||
if (!Setting.isMobile()) {
|
if (!Setting.isMobile()) {
|
||||||
return (
|
return (
|
||||||
@ -595,7 +626,7 @@ class App extends Component {
|
|||||||
// theme="dark"
|
// theme="dark"
|
||||||
mode={(Setting.isMobile() && this.isStartPages()) ? "inline" : "horizontal"}
|
mode={(Setting.isMobile() && this.isStartPages()) ? "inline" : "horizontal"}
|
||||||
selectedKeys={[`${this.state.selectedMenuKey}`]}
|
selectedKeys={[`${this.state.selectedMenuKey}`]}
|
||||||
style={{lineHeight: "64px", width: "80%", position: "absolute", left: "145px"}}
|
style={{lineHeight: "64px", position: "absolute", left: "145px", right: "200px"}}
|
||||||
>
|
>
|
||||||
{
|
{
|
||||||
this.renderMenu()
|
this.renderMenu()
|
||||||
@ -628,22 +659,28 @@ class App extends Component {
|
|||||||
</Link>
|
</Link>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
<Menu
|
<Drawer title={i18next.t("general:Close")} placement="left" visible={this.state.menuVisible} onClose={this.onClose}>
|
||||||
// theme="dark"
|
<Menu
|
||||||
mode={(Setting.isMobile() && this.isStartPages()) ? "inline" : "horizontal"}
|
// theme="dark"
|
||||||
selectedKeys={[`${this.state.selectedMenuKey}`]}
|
mode={(Setting.isMobile()) ? "inline" : "horizontal"}
|
||||||
style={{lineHeight: "64px"}}
|
selectedKeys={[`${this.state.selectedMenuKey}`]}
|
||||||
>
|
style={{lineHeight: "64px"}}
|
||||||
{
|
onClick={this.onClose}
|
||||||
this.renderMenu()
|
>
|
||||||
}
|
|
||||||
<div style = {{float: "right"}}>
|
|
||||||
{
|
{
|
||||||
this.renderAccount()
|
this.renderMenu()
|
||||||
}
|
}
|
||||||
<SelectLanguageBox />
|
</Menu>
|
||||||
</div>
|
</Drawer>
|
||||||
</Menu>
|
<Button icon={<BarsOutlined />} onClick={this.showMenu} type="text">
|
||||||
|
{i18next.t("general:Menu")}
|
||||||
|
</Button>
|
||||||
|
<div style = {{float: "right"}}>
|
||||||
|
{
|
||||||
|
this.renderAccount()
|
||||||
|
}
|
||||||
|
<SelectLanguageBox />
|
||||||
|
</div>
|
||||||
</Header>
|
</Header>
|
||||||
{
|
{
|
||||||
this.renderRouter()
|
this.renderRouter()
|
||||||
@ -658,15 +695,18 @@ class App extends Component {
|
|||||||
// https://www.freecodecamp.org/neyarnws/how-to-keep-your-footer-where-it-belongs-59c6aa05c59c/
|
// https://www.freecodecamp.org/neyarnws/how-to-keep-your-footer-where-it-belongs-59c6aa05c59c/
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Footer id="footer" style={
|
<>
|
||||||
{
|
{!this.state.account ? null : <div style={{display: "none"}} id="CasdoorApplicationName" value={this.state.account.signupApplication} />}
|
||||||
borderTop: "1px solid #e8e8e8",
|
<Footer id="footer" style={
|
||||||
backgroundColor: "white",
|
{
|
||||||
textAlign: "center",
|
borderTop: "1px solid #e8e8e8",
|
||||||
}
|
backgroundColor: "white",
|
||||||
}>
|
textAlign: "center",
|
||||||
Made with <span style={{color: "rgb(255, 255, 255)"}}>❤️</span> by <a style={{fontWeight: "bold", color: "black"}} target="_blank" href="https://casdoor.org" rel="noreferrer">Casdoor</a>
|
}
|
||||||
</Footer>
|
}>
|
||||||
|
Powered by <a target="_blank" href="https://casdoor.org" rel="noreferrer"><img style={{paddingBottom: "3px"}} height={"20px"} alt={"Casdoor"} src={`${Setting.StaticBaseUrl}/img/casdoor-logo_1185x256.png`} /></a>
|
||||||
|
</Footer>
|
||||||
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -682,8 +722,8 @@ class App extends Component {
|
|||||||
renderPage() {
|
renderPage() {
|
||||||
if (this.isDoorPages()) {
|
if (this.isDoorPages()) {
|
||||||
return (
|
return (
|
||||||
<div style={{position: "relative", minHeight: "100vh"}}>
|
<div style={{display: "flex", flexDirection: "column", height: "100%"}}>
|
||||||
<div id="content-wrap" style={{flexDirection: "column"}}>
|
<div id="login-content-wrap" style={{flexDirection: "column"}}>
|
||||||
<Switch>
|
<Switch>
|
||||||
<Route exact path="/signup" render={(props) => this.renderHomeIfLoggedIn(<SignupPage account={this.state.account} {...props} />)} />
|
<Route exact path="/signup" render={(props) => this.renderHomeIfLoggedIn(<SignupPage account={this.state.account} {...props} />)} />
|
||||||
<Route exact path="/signup/:applicationName" render={(props) => this.renderHomeIfLoggedIn(<SignupPage account={this.state.account} {...props} onUpdateAccount={(account) => {this.onUpdateAccount(account);}} />)} />
|
<Route exact path="/signup/:applicationName" render={(props) => this.renderHomeIfLoggedIn(<SignupPage account={this.state.account} {...props} onUpdateAccount={(account) => {this.onUpdateAccount(account);}} />)} />
|
||||||
@ -746,7 +786,6 @@ class App extends Component {
|
|||||||
const organization = this.state.account.organization;
|
const organization = this.state.account.organization;
|
||||||
return (
|
return (
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<div style={{display: "none"}} id="CasdoorApplicationName" value={this.state.account.signupApplication} />
|
|
||||||
<Helmet>
|
<Helmet>
|
||||||
<title>{organization.displayName}</title>
|
<title>{organization.displayName}</title>
|
||||||
<link rel="icon" href={organization.favicon} />
|
<link rel="icon" href={organization.favicon} />
|
||||||
@ -759,4 +798,4 @@ class App extends Component {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default withRouter(App);
|
export default withRouter(withTranslation()(App));
|
||||||
|
@ -28,32 +28,49 @@
|
|||||||
color: #61dafb;
|
color: #61dafb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#root {
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
#parent-area {
|
#parent-area {
|
||||||
position: relative;
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
height: 100%;
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
background-color: #f5f5f5;
|
background-color: #f5f5f5;
|
||||||
display: flex;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#content-wrap {
|
#content-wrap {
|
||||||
padding-bottom: 70px; /* Footer height */
|
|
||||||
display: flex;
|
display: flex;
|
||||||
|
flex: 1 1 0;
|
||||||
align-items: stretch;
|
align-items: stretch;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#login-content-wrap {
|
||||||
|
display: flex;
|
||||||
|
flex: 1 1 0;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
#footer {
|
#footer {
|
||||||
position: absolute;
|
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 70px; /* Footer height */
|
height: 70px; /* Footer height */
|
||||||
}
|
}
|
||||||
|
|
||||||
.language_box {
|
#language-box-corner {
|
||||||
|
position: absolute;
|
||||||
|
top: 75px;
|
||||||
|
right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.language-box {
|
||||||
background: url("@{StaticBaseUrl}/img/muti_language.svg");
|
background: url("@{StaticBaseUrl}/img/muti_language.svg");
|
||||||
background-size: 25px, 25px;
|
background-size: 25px, 25px;
|
||||||
background-position: center;
|
background-position: center;
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
|
border-radius: 5px;
|
||||||
width: 45px;
|
width: 45px;
|
||||||
height: 65px;
|
height: 65px;
|
||||||
float: right;
|
float: right;
|
||||||
@ -76,3 +93,54 @@
|
|||||||
flex: 1;
|
flex: 1;
|
||||||
align-items: stretch;
|
align-items: stretch;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.side-image {
|
||||||
|
display: none;
|
||||||
|
|
||||||
|
@media screen and (min-width: 1100px) {
|
||||||
|
display: block;
|
||||||
|
position: relative;
|
||||||
|
width: 500px;
|
||||||
|
border-right: 0.5px solid rgb(196 203 215);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.forget-content {
|
||||||
|
padding: 10px 100px 20px;
|
||||||
|
border: 2px solid #fff;
|
||||||
|
border-radius: 7px;
|
||||||
|
background-color: rgb(255 255 255);
|
||||||
|
box-shadow: 0 0 20px rgb(0 0 0 / 20%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-panel {
|
||||||
|
margin-top: 50px;
|
||||||
|
margin-bottom: 50px;
|
||||||
|
display: flex;
|
||||||
|
background-color: rgb(255 255 255);
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-form {
|
||||||
|
text-align: center;
|
||||||
|
padding: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-content {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
box-sizing: border-box;
|
||||||
|
margin: 0 auto;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.loginBackground {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
flex: 1 1 0;
|
||||||
|
background: #fff no-repeat;
|
||||||
|
background-size: 100% 100%;
|
||||||
|
background-attachment: fixed;
|
||||||
|
}
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import {Button, Card, Col, Input, Popover, Row, Select, Switch, Upload} from "antd";
|
import {Button, Card, Col, Input, Popover, Radio, Row, Select, Switch, Upload} from "antd";
|
||||||
import {CopyOutlined, LinkOutlined, UploadOutlined} from "@ant-design/icons";
|
import {CopyOutlined, LinkOutlined, UploadOutlined} from "@ant-design/icons";
|
||||||
import * as ApplicationBackend from "./backend/ApplicationBackend";
|
import * as ApplicationBackend from "./backend/ApplicationBackend";
|
||||||
import * as CertBackend from "./backend/CertBackend";
|
import * as CertBackend from "./backend/CertBackend";
|
||||||
@ -32,12 +32,60 @@ import copy from "copy-to-clipboard";
|
|||||||
|
|
||||||
import {Controlled as CodeMirror} from "react-codemirror2";
|
import {Controlled as CodeMirror} from "react-codemirror2";
|
||||||
import "codemirror/lib/codemirror.css";
|
import "codemirror/lib/codemirror.css";
|
||||||
|
|
||||||
require("codemirror/theme/material-darker.css");
|
require("codemirror/theme/material-darker.css");
|
||||||
require("codemirror/mode/htmlmixed/htmlmixed");
|
require("codemirror/mode/htmlmixed/htmlmixed");
|
||||||
require("codemirror/mode/xml/xml");
|
require("codemirror/mode/xml/xml");
|
||||||
|
require("codemirror/mode/css/css");
|
||||||
|
|
||||||
const {Option} = Select;
|
const {Option} = Select;
|
||||||
|
|
||||||
|
const template = `<style>
|
||||||
|
.login-panel{
|
||||||
|
padding: 40px 70px 0 70px;
|
||||||
|
border-radius: 10px;
|
||||||
|
background-color: #ffffff;
|
||||||
|
box-shadow: 0 0 30px 20px rgba(0, 0, 0, 0.20);
|
||||||
|
}
|
||||||
|
</style>`;
|
||||||
|
|
||||||
|
const sideTemplate = `<style>
|
||||||
|
.left-model{
|
||||||
|
text-align: center;
|
||||||
|
padding: 30px;
|
||||||
|
background-color: #8ca0ed;
|
||||||
|
position: absolute;
|
||||||
|
transform: none;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
.side-logo{
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
.side-logo span {
|
||||||
|
font-family: Montserrat, sans-serif;
|
||||||
|
font-weight: 900;
|
||||||
|
font-size: 2.4rem;
|
||||||
|
line-height: 1.3;
|
||||||
|
margin-left: 16px;
|
||||||
|
color: #404040;
|
||||||
|
}
|
||||||
|
.img{
|
||||||
|
max-width: none;
|
||||||
|
margin: 41px 0 13px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<div class="left-model">
|
||||||
|
<span class="side-logo"> <img src="https://cdn.casbin.org/img/casdoor-logo_1185x256.png" alt="Casdoor" style="width: 120px">
|
||||||
|
<span>SSO</span>
|
||||||
|
</span>
|
||||||
|
<div class="img">
|
||||||
|
<img src="https://cdn.casbin.org/img/casbin.svg" alt="Casdoor"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
class ApplicationEditPage extends React.Component {
|
class ApplicationEditPage extends React.Component {
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(props);
|
super(props);
|
||||||
@ -111,7 +159,7 @@ class ApplicationEditPage extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
parseApplicationField(key, value) {
|
parseApplicationField(key, value) {
|
||||||
if (["expireInHours", "refreshExpireInHours"].includes(key)) {
|
if (["expireInHours", "refreshExpireInHours", "offset"].includes(key)) {
|
||||||
value = Setting.myParseInt(value);
|
value = Setting.myParseInt(value);
|
||||||
}
|
}
|
||||||
return value;
|
return value;
|
||||||
@ -343,6 +391,16 @@ class ApplicationEditPage extends React.Component {
|
|||||||
}} />
|
}} />
|
||||||
</Col>
|
</Col>
|
||||||
</Row>
|
</Row>
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 19 : 2}>
|
||||||
|
{Setting.getLabel(i18next.t("application:Auto signin"), i18next.t("application:Auto signin - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={1} >
|
||||||
|
<Switch checked={this.state.application.enableAutoSignin} onChange={checked => {
|
||||||
|
this.updateApplicationField("enableAutoSignin", checked);
|
||||||
|
}} />
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
<Row style={{marginTop: "20px"}} >
|
<Row style={{marginTop: "20px"}} >
|
||||||
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 19 : 2}>
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 19 : 2}>
|
||||||
{Setting.getLabel(i18next.t("application:Enable code signin"), i18next.t("application:Enable code signin - Tooltip"))} :
|
{Setting.getLabel(i18next.t("application:Enable code signin"), i18next.t("application:Enable code signin - Tooltip"))} :
|
||||||
@ -536,6 +594,94 @@ class ApplicationEditPage extends React.Component {
|
|||||||
this.renderSignupSigninPreview()
|
this.renderSignupSigninPreview()
|
||||||
}
|
}
|
||||||
</Row>
|
</Row>
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||||
|
{Setting.getLabel(i18next.t("application:Background URL"), i18next.t("application:Background URL - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={22} style={(Setting.isMobile()) ? {maxWidth: "100%"} : {}}>
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||||
|
{Setting.getLabel(i18next.t("general:URL"), i18next.t("general:URL - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={22} >
|
||||||
|
<Input prefix={<LinkOutlined />} value={this.state.application.formBackgroundUrl} onChange={e => {
|
||||||
|
this.updateApplicationField("formBackgroundUrl", e.target.value);
|
||||||
|
}} />
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||||
|
{i18next.t("general:Preview")}:
|
||||||
|
</Col>
|
||||||
|
<Col span={22} >
|
||||||
|
<a target="_blank" rel="noreferrer" href={this.state.application.formBackgroundUrl}>
|
||||||
|
<img src={this.state.application.formBackgroundUrl} alt={this.state.application.formBackgroundUrl} height={90} style={{marginBottom: "20px"}} />
|
||||||
|
</a>
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
<Row>
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||||
|
{Setting.getLabel(i18next.t("application:Form CSS"), i18next.t("application:Form CSS - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={22}>
|
||||||
|
<Popover placement="right" content={
|
||||||
|
<div style={{width: "900px", height: "300px"}} >
|
||||||
|
<CodeMirror value={this.state.application.formCss === "" ? template : this.state.application.formCss}
|
||||||
|
options={{mode: "css", theme: "material-darker"}}
|
||||||
|
onBeforeChange={(editor, data, value) => {
|
||||||
|
this.updateApplicationField("formCss", value);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
} title={i18next.t("application:Form CSS - Edit")} trigger="click">
|
||||||
|
<Input value={this.state.application.formCss} style={{marginBottom: "10px"}} onChange={e => {
|
||||||
|
this.updateApplicationField("formCss", e.target.value);
|
||||||
|
}} />
|
||||||
|
</Popover>
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
|
||||||
|
{Setting.getLabel(i18next.t("application:Form position"), i18next.t("application:Form position - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={22} >
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Radio.Group onChange={e => {this.updateApplicationField("formOffset", e.target.value);}} value={this.state.application.formOffset}>
|
||||||
|
<Radio.Button value={1}>{i18next.t("application:Left")}</Radio.Button>
|
||||||
|
<Radio.Button value={2}>{i18next.t("application:Center")}</Radio.Button>
|
||||||
|
<Radio.Button value={3}>{i18next.t("application:Right")}</Radio.Button>
|
||||||
|
<Radio.Button value={4}>
|
||||||
|
{i18next.t("application:Enable side panel")}
|
||||||
|
</Radio.Button>
|
||||||
|
</Radio.Group>
|
||||||
|
</Row>
|
||||||
|
{this.state.application.formOffset === 4 ?
|
||||||
|
<Row style={{marginTop: "20px"}} >
|
||||||
|
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 3}>
|
||||||
|
{Setting.getLabel(i18next.t("application:Side panel HTML"), i18next.t("application:Side panel HTML - Tooltip"))} :
|
||||||
|
</Col>
|
||||||
|
<Col span={21} >
|
||||||
|
<Popover placement="right" content={
|
||||||
|
<div style={{width: "900px", height: "300px"}} >
|
||||||
|
<CodeMirror value={this.state.application.formSideHtml === "" ? sideTemplate : this.state.application.formSideHtml}
|
||||||
|
options={{mode: "htmlmixed", theme: "material-darker"}}
|
||||||
|
onBeforeChange={(editor, data, value) => {
|
||||||
|
this.updateApplicationField("formSideHtml", value);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
} title={i18next.t("application:Side panel HTML - Edit")} trigger="click">
|
||||||
|
<Input value={this.state.application.formSideHtml} style={{marginBottom: "10px"}} onChange={e => {
|
||||||
|
this.updateApplicationField("formSideHtml", e.target.value);
|
||||||
|
}} />
|
||||||
|
</Popover>
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
|
: null}
|
||||||
|
</Col>
|
||||||
|
</Row>
|
||||||
{
|
{
|
||||||
!this.state.application.enableSignUp ? null : (
|
!this.state.application.enableSignUp ? null : (
|
||||||
<Row style={{marginTop: "20px"}} >
|
<Row style={{marginTop: "20px"}} >
|
||||||
@ -591,7 +737,7 @@ class ApplicationEditPage extends React.Component {
|
|||||||
<LoginPage type={"login"} mode={"signup"} application={this.state.application} />
|
<LoginPage type={"login"} mode={"signup"} application={this.state.application} />
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
<div style={maskStyle}></div>
|
<div style={maskStyle} />
|
||||||
</div>
|
</div>
|
||||||
</Col>
|
</Col>
|
||||||
<Col span={11}>
|
<Col span={11}>
|
||||||
@ -605,7 +751,7 @@ class ApplicationEditPage extends React.Component {
|
|||||||
<br />
|
<br />
|
||||||
<div style={{position: "relative", width: "90%", border: "1px solid rgb(217,217,217)", boxShadow: "10px 10px 5px #888888", alignItems: "center", overflow: "auto", flexDirection: "column", flex: "auto"}}>
|
<div style={{position: "relative", width: "90%", border: "1px solid rgb(217,217,217)", boxShadow: "10px 10px 5px #888888", alignItems: "center", overflow: "auto", flexDirection: "column", flex: "auto"}}>
|
||||||
<LoginPage type={"login"} mode={"signin"} application={this.state.application} />
|
<LoginPage type={"login"} mode={"signin"} application={this.state.application} />
|
||||||
<div style={maskStyle}></div>
|
<div style={maskStyle} />
|
||||||
</div>
|
</div>
|
||||||
</Col>
|
</Col>
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
@ -627,7 +773,7 @@ class ApplicationEditPage extends React.Component {
|
|||||||
<br />
|
<br />
|
||||||
<div style={{position: "relative", width: "90%", border: "1px solid rgb(217,217,217)", boxShadow: "10px 10px 5px #888888", flexDirection: "column", flex: "auto"}}>
|
<div style={{position: "relative", width: "90%", border: "1px solid rgb(217,217,217)", boxShadow: "10px 10px 5px #888888", flexDirection: "column", flex: "auto"}}>
|
||||||
<PromptPage application={this.state.application} account={this.props.account} />
|
<PromptPage application={this.state.application} account={this.props.account} />
|
||||||
<div style={maskStyle}></div>
|
<div style={maskStyle} />
|
||||||
</div>
|
</div>
|
||||||
</Col>
|
</Col>
|
||||||
);
|
);
|
||||||
|
@ -53,6 +53,7 @@ class ApplicationListPage extends BaseListPage {
|
|||||||
redirectUris: ["http://localhost:9000/callback"],
|
redirectUris: ["http://localhost:9000/callback"],
|
||||||
tokenFormat: "JWT",
|
tokenFormat: "JWT",
|
||||||
expireInHours: 24 * 7,
|
expireInHours: 24 * 7,
|
||||||
|
formOffset: 8,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user