mirror of
https://github.com/mainflux/mainflux.git
synced 2025-05-02 22:17:10 +08:00

* Return Auth service Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update Compose to run with SpiceDB and Auth svc Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update auth gRPC API Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Remove Users' policies Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Move Groups to internal Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Use shared groups in Users Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Remove unused code Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Use pkg Groups in Things Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Remove Things groups Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Make imports consistent Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update Groups networking Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Remove things groups-specific API Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Move Things Clients to the root Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Move Clients to Users root Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Temporarily remove tracing Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Fix imports Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Add buffer config for gRPC Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update auth type for Things Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Use Auth for login Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Add temporary solution for refresh token Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update Tokenizer interface Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Updade tokens issuing Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Fix token issuing Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update JWT validator and refactor Tokenizer Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Rename access timeout Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Rename login to authenticate Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update Identify to use SubjectID Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Add Auth to Groups Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Use the Auth service for Groups Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update auth schema Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Fix Auth for Groups Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Add auth for addons (#14) Signed-off-by: Arvindh <arvindh91@gmail.com> Speparate Login and Refresh tokens Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Merge authN and authZ requests for things Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Add connect and disconnect Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update sharing Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Fix policies addition and removal Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Update relation with roels Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Add gRPC to Things Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Assign and Unassign members to group and Listing of Group members (#15) * add auth for addons Signed-off-by: Arvindh <arvindh91@gmail.com> * add assign and unassign to group Signed-off-by: Arvindh <arvindh91@gmail.com> * add group incomplete repo implementation Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users Signed-off-by: Arvindh <arvindh91@gmail.com> --------- Signed-off-by: Arvindh <arvindh91@gmail.com> Move coap mqtt and ws policies to spicedb (#16) Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Remove old policies Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> NOISSUE - Things authorize to return thingID (#18) This commit modifies the authorize endpoint to the grpc endpoint to return thingID. The authorize endpoint allows adapters to get the publisher of the message. Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Add Groups to users service (#17) * add assign and unassign to group Signed-off-by: Arvindh <arvindh91@gmail.com> * add group incomplete repo implementation Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users stable 1 Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users stable 2 Signed-off-by: Arvindh <arvindh91@gmail.com> * groups for users & things Signed-off-by: Arvindh <arvindh91@gmail.com> * Amend signature Signed-off-by: Arvindh <arvindh91@gmail.com> * fix merge error Signed-off-by: Arvindh <arvindh91@gmail.com> --------- Signed-off-by: Arvindh <arvindh91@gmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Fix es code (#21) Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Fix Bugs (#20) * fix bugs Signed-off-by: Arvindh <arvindh91@gmail.com> * fix bugs Signed-off-by: Arvindh <arvindh91@gmail.com> --------- Signed-off-by: Arvindh <arvindh91@gmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Test e2e (#19) * fix: connect method Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * fix: e2e Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * fix changes in sdk and e2e Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * feat(docker): remove unnecessary port mapping Remove the port mapping for MQTT broker in the docker-compose.yml file. Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * Enable group listing Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * feat(responses): update ChannelsPage struct The ChannelsPage struct in the responses.go file has been updated. The "Channels" field has been renamed to "Groups" to provide more accurate naming. This change ensures consistency and clarity in the codebase. Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * feat(things): add UpdateClientSecret method Add the UpdateClientSecret method to the things service. This method allows updating the client secret for a specific client identified by the provided token, id, and key parameters. Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> --------- Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Use smaller buffers for gRPC Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Clean up tests (#22) Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Add Connect Disconnect endpoints (#23) * fix bugs Signed-off-by: Arvindh <arvindh91@gmail.com> * fix bugs Signed-off-by: Arvindh <arvindh91@gmail.com> * fix list of things in a channel and Add connect disconnect endpoint Signed-off-by: Arvindh <arvindh91@gmail.com> * fix list of things in a channel and Add connect disconnect endpoint Signed-off-by: Arvindh <arvindh91@gmail.com> --------- Signed-off-by: Arvindh <arvindh91@gmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Add: Things share with users (#25) * fix list of things in a channel and Add connect disconnect endpoint Signed-off-by: Arvindh <arvindh91@gmail.com> * add: things share with other users Signed-off-by: Arvindh <arvindh91@gmail.com> --------- Signed-off-by: Arvindh <arvindh91@gmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Rename gRPC Services (#24) * Rename things and users auth service Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * docs: add authorization docs for gRPC services Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * Rename things and users grpc services Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * Remove mainflux.env package Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> --------- Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Add: Listing of things, channels, groups, users (#26) * add: listing of channels, users, groups, things Signed-off-by: Arvindh <arvindh91@gmail.com> * add: listing of channels, users, groups, things Signed-off-by: Arvindh <arvindh91@gmail.com> * add: listing of channels, users, groups, things Signed-off-by: Arvindh <arvindh91@gmail.com> * add: listing of channels, users, groups, things Signed-off-by: Arvindh <arvindh91@gmail.com> --------- Signed-off-by: Arvindh <arvindh91@gmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Clean Up Users (#27) * feat(groups): rename redis package to events - Renamed the `redis` package to `events` in the `internal/groups` directory. - Updated the file paths and names accordingly. - This change reflects the more accurate purpose of the package and improves code organization. Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * feat(auth): Modify identity method Change request and response of identity method Add accessToken and refreshToken to Token response Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * clean up users, remove dead code Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * feat(users): add unit tests for user service This commit adds unit tests for the user service in the `users` package. The tests cover various scenarios and ensure the correct behavior of the service. Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> --------- Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Add: List of user groups & removed repeating code in groups (#29) * removed repeating code in list groups Signed-off-by: Arvindh <arvindh91@gmail.com> * add: list of user group Signed-off-by: Arvindh <arvindh91@gmail.com> * fix: otel handler operator name for endpoints Signed-off-by: Arvindh <arvindh91@gmail.com> --------- Signed-off-by: Arvindh <arvindh91@gmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Clean Up Things Service (#28) * Rework things service Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * add tests Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> --------- Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Clean Up Auth Service (#30) * clean up auth service Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * feat(auth): remove unused import Remove the unused import of `emptypb` in `auth.pb.go`. This import is not being used in the codebase and can be safely removed. Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> --------- Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * NOISSUE - Update API docs (#31) Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Remove TODO comments and cleanup the code Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> * Update dependenices Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> --------- Signed-off-by: Arvindh <arvindh91@gmail.com> Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com> Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Co-authored-by: b1ackd0t <28790446+rodneyosodo@users.noreply.github.com> Co-authored-by: Arvindh <30824765+arvindh123@users.noreply.github.com>
382 lines
9.4 KiB
Go
382 lines
9.4 KiB
Go
package runtime
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
|
|
"google.golang.org/grpc/grpclog"
|
|
)
|
|
|
|
var (
|
|
// ErrNotMatch indicates that the given HTTP request path does not match to the pattern.
|
|
ErrNotMatch = errors.New("not match to the path pattern")
|
|
// ErrInvalidPattern indicates that the given definition of Pattern is not valid.
|
|
ErrInvalidPattern = errors.New("invalid pattern")
|
|
)
|
|
|
|
type MalformedSequenceError string
|
|
|
|
func (e MalformedSequenceError) Error() string {
|
|
return "malformed path escape " + strconv.Quote(string(e))
|
|
}
|
|
|
|
type op struct {
|
|
code utilities.OpCode
|
|
operand int
|
|
}
|
|
|
|
// Pattern is a template pattern of http request paths defined in
|
|
// https://github.com/googleapis/googleapis/blob/master/google/api/http.proto
|
|
type Pattern struct {
|
|
// ops is a list of operations
|
|
ops []op
|
|
// pool is a constant pool indexed by the operands or vars.
|
|
pool []string
|
|
// vars is a list of variables names to be bound by this pattern
|
|
vars []string
|
|
// stacksize is the max depth of the stack
|
|
stacksize int
|
|
// tailLen is the length of the fixed-size segments after a deep wildcard
|
|
tailLen int
|
|
// verb is the VERB part of the path pattern. It is empty if the pattern does not have VERB part.
|
|
verb string
|
|
}
|
|
|
|
// NewPattern returns a new Pattern from the given definition values.
|
|
// "ops" is a sequence of op codes. "pool" is a constant pool.
|
|
// "verb" is the verb part of the pattern. It is empty if the pattern does not have the part.
|
|
// "version" must be 1 for now.
|
|
// It returns an error if the given definition is invalid.
|
|
func NewPattern(version int, ops []int, pool []string, verb string) (Pattern, error) {
|
|
if version != 1 {
|
|
grpclog.Infof("unsupported version: %d", version)
|
|
return Pattern{}, ErrInvalidPattern
|
|
}
|
|
|
|
l := len(ops)
|
|
if l%2 != 0 {
|
|
grpclog.Infof("odd number of ops codes: %d", l)
|
|
return Pattern{}, ErrInvalidPattern
|
|
}
|
|
|
|
var (
|
|
typedOps []op
|
|
stack, maxstack int
|
|
tailLen int
|
|
pushMSeen bool
|
|
vars []string
|
|
)
|
|
for i := 0; i < l; i += 2 {
|
|
op := op{code: utilities.OpCode(ops[i]), operand: ops[i+1]}
|
|
switch op.code {
|
|
case utilities.OpNop:
|
|
continue
|
|
case utilities.OpPush:
|
|
if pushMSeen {
|
|
tailLen++
|
|
}
|
|
stack++
|
|
case utilities.OpPushM:
|
|
if pushMSeen {
|
|
grpclog.Infof("pushM appears twice")
|
|
return Pattern{}, ErrInvalidPattern
|
|
}
|
|
pushMSeen = true
|
|
stack++
|
|
case utilities.OpLitPush:
|
|
if op.operand < 0 || len(pool) <= op.operand {
|
|
grpclog.Infof("negative literal index: %d", op.operand)
|
|
return Pattern{}, ErrInvalidPattern
|
|
}
|
|
if pushMSeen {
|
|
tailLen++
|
|
}
|
|
stack++
|
|
case utilities.OpConcatN:
|
|
if op.operand <= 0 {
|
|
grpclog.Infof("negative concat size: %d", op.operand)
|
|
return Pattern{}, ErrInvalidPattern
|
|
}
|
|
stack -= op.operand
|
|
if stack < 0 {
|
|
grpclog.Info("stack underflow")
|
|
return Pattern{}, ErrInvalidPattern
|
|
}
|
|
stack++
|
|
case utilities.OpCapture:
|
|
if op.operand < 0 || len(pool) <= op.operand {
|
|
grpclog.Infof("variable name index out of bound: %d", op.operand)
|
|
return Pattern{}, ErrInvalidPattern
|
|
}
|
|
v := pool[op.operand]
|
|
op.operand = len(vars)
|
|
vars = append(vars, v)
|
|
stack--
|
|
if stack < 0 {
|
|
grpclog.Infof("stack underflow")
|
|
return Pattern{}, ErrInvalidPattern
|
|
}
|
|
default:
|
|
grpclog.Infof("invalid opcode: %d", op.code)
|
|
return Pattern{}, ErrInvalidPattern
|
|
}
|
|
|
|
if maxstack < stack {
|
|
maxstack = stack
|
|
}
|
|
typedOps = append(typedOps, op)
|
|
}
|
|
return Pattern{
|
|
ops: typedOps,
|
|
pool: pool,
|
|
vars: vars,
|
|
stacksize: maxstack,
|
|
tailLen: tailLen,
|
|
verb: verb,
|
|
}, nil
|
|
}
|
|
|
|
// MustPattern is a helper function which makes it easier to call NewPattern in variable initialization.
|
|
func MustPattern(p Pattern, err error) Pattern {
|
|
if err != nil {
|
|
grpclog.Fatalf("Pattern initialization failed: %v", err)
|
|
}
|
|
return p
|
|
}
|
|
|
|
// MatchAndEscape examines components to determine if they match to a Pattern.
|
|
// MatchAndEscape will return an error if no Patterns matched or if a pattern
|
|
// matched but contained malformed escape sequences. If successful, the function
|
|
// returns a mapping from field paths to their captured values.
|
|
func (p Pattern) MatchAndEscape(components []string, verb string, unescapingMode UnescapingMode) (map[string]string, error) {
|
|
if p.verb != verb {
|
|
if p.verb != "" {
|
|
return nil, ErrNotMatch
|
|
}
|
|
if len(components) == 0 {
|
|
components = []string{":" + verb}
|
|
} else {
|
|
components = append([]string{}, components...)
|
|
components[len(components)-1] += ":" + verb
|
|
}
|
|
}
|
|
|
|
var pos int
|
|
stack := make([]string, 0, p.stacksize)
|
|
captured := make([]string, len(p.vars))
|
|
l := len(components)
|
|
for _, op := range p.ops {
|
|
var err error
|
|
|
|
switch op.code {
|
|
case utilities.OpNop:
|
|
continue
|
|
case utilities.OpPush, utilities.OpLitPush:
|
|
if pos >= l {
|
|
return nil, ErrNotMatch
|
|
}
|
|
c := components[pos]
|
|
if op.code == utilities.OpLitPush {
|
|
if lit := p.pool[op.operand]; c != lit {
|
|
return nil, ErrNotMatch
|
|
}
|
|
} else if op.code == utilities.OpPush {
|
|
if c, err = unescape(c, unescapingMode, false); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
stack = append(stack, c)
|
|
pos++
|
|
case utilities.OpPushM:
|
|
end := len(components)
|
|
if end < pos+p.tailLen {
|
|
return nil, ErrNotMatch
|
|
}
|
|
end -= p.tailLen
|
|
c := strings.Join(components[pos:end], "/")
|
|
if c, err = unescape(c, unescapingMode, true); err != nil {
|
|
return nil, err
|
|
}
|
|
stack = append(stack, c)
|
|
pos = end
|
|
case utilities.OpConcatN:
|
|
n := op.operand
|
|
l := len(stack) - n
|
|
stack = append(stack[:l], strings.Join(stack[l:], "/"))
|
|
case utilities.OpCapture:
|
|
n := len(stack) - 1
|
|
captured[op.operand] = stack[n]
|
|
stack = stack[:n]
|
|
}
|
|
}
|
|
if pos < l {
|
|
return nil, ErrNotMatch
|
|
}
|
|
bindings := make(map[string]string)
|
|
for i, val := range captured {
|
|
bindings[p.vars[i]] = val
|
|
}
|
|
return bindings, nil
|
|
}
|
|
|
|
// MatchAndEscape examines components to determine if they match to a Pattern.
|
|
// It will never perform per-component unescaping (see: UnescapingModeLegacy).
|
|
// MatchAndEscape will return an error if no Patterns matched. If successful,
|
|
// the function returns a mapping from field paths to their captured values.
|
|
//
|
|
// Deprecated: Use MatchAndEscape.
|
|
func (p Pattern) Match(components []string, verb string) (map[string]string, error) {
|
|
return p.MatchAndEscape(components, verb, UnescapingModeDefault)
|
|
}
|
|
|
|
// Verb returns the verb part of the Pattern.
|
|
func (p Pattern) Verb() string { return p.verb }
|
|
|
|
func (p Pattern) String() string {
|
|
var stack []string
|
|
for _, op := range p.ops {
|
|
switch op.code {
|
|
case utilities.OpNop:
|
|
continue
|
|
case utilities.OpPush:
|
|
stack = append(stack, "*")
|
|
case utilities.OpLitPush:
|
|
stack = append(stack, p.pool[op.operand])
|
|
case utilities.OpPushM:
|
|
stack = append(stack, "**")
|
|
case utilities.OpConcatN:
|
|
n := op.operand
|
|
l := len(stack) - n
|
|
stack = append(stack[:l], strings.Join(stack[l:], "/"))
|
|
case utilities.OpCapture:
|
|
n := len(stack) - 1
|
|
stack[n] = fmt.Sprintf("{%s=%s}", p.vars[op.operand], stack[n])
|
|
}
|
|
}
|
|
segs := strings.Join(stack, "/")
|
|
if p.verb != "" {
|
|
return fmt.Sprintf("/%s:%s", segs, p.verb)
|
|
}
|
|
return "/" + segs
|
|
}
|
|
|
|
/*
|
|
* The following code is adopted and modified from Go's standard library
|
|
* and carries the attached license.
|
|
*
|
|
* Copyright 2009 The Go Authors. All rights reserved.
|
|
* Use of this source code is governed by a BSD-style
|
|
* license that can be found in the LICENSE file.
|
|
*/
|
|
|
|
// ishex returns whether or not the given byte is a valid hex character
|
|
func ishex(c byte) bool {
|
|
switch {
|
|
case '0' <= c && c <= '9':
|
|
return true
|
|
case 'a' <= c && c <= 'f':
|
|
return true
|
|
case 'A' <= c && c <= 'F':
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
func isRFC6570Reserved(c byte) bool {
|
|
switch c {
|
|
case '!', '#', '$', '&', '\'', '(', ')', '*',
|
|
'+', ',', '/', ':', ';', '=', '?', '@', '[', ']':
|
|
return true
|
|
default:
|
|
return false
|
|
}
|
|
}
|
|
|
|
// unhex converts a hex point to the bit representation
|
|
func unhex(c byte) byte {
|
|
switch {
|
|
case '0' <= c && c <= '9':
|
|
return c - '0'
|
|
case 'a' <= c && c <= 'f':
|
|
return c - 'a' + 10
|
|
case 'A' <= c && c <= 'F':
|
|
return c - 'A' + 10
|
|
}
|
|
return 0
|
|
}
|
|
|
|
// shouldUnescapeWithMode returns true if the character is escapable with the
|
|
// given mode
|
|
func shouldUnescapeWithMode(c byte, mode UnescapingMode) bool {
|
|
switch mode {
|
|
case UnescapingModeAllExceptReserved:
|
|
if isRFC6570Reserved(c) {
|
|
return false
|
|
}
|
|
case UnescapingModeAllExceptSlash:
|
|
if c == '/' {
|
|
return false
|
|
}
|
|
case UnescapingModeAllCharacters:
|
|
return true
|
|
}
|
|
return true
|
|
}
|
|
|
|
// unescape unescapes a path string using the provided mode
|
|
func unescape(s string, mode UnescapingMode, multisegment bool) (string, error) {
|
|
// TODO(v3): remove UnescapingModeLegacy
|
|
if mode == UnescapingModeLegacy {
|
|
return s, nil
|
|
}
|
|
|
|
if !multisegment {
|
|
mode = UnescapingModeAllCharacters
|
|
}
|
|
|
|
// Count %, check that they're well-formed.
|
|
n := 0
|
|
for i := 0; i < len(s); {
|
|
if s[i] == '%' {
|
|
n++
|
|
if i+2 >= len(s) || !ishex(s[i+1]) || !ishex(s[i+2]) {
|
|
s = s[i:]
|
|
if len(s) > 3 {
|
|
s = s[:3]
|
|
}
|
|
|
|
return "", MalformedSequenceError(s)
|
|
}
|
|
i += 3
|
|
} else {
|
|
i++
|
|
}
|
|
}
|
|
|
|
if n == 0 {
|
|
return s, nil
|
|
}
|
|
|
|
var t strings.Builder
|
|
t.Grow(len(s))
|
|
for i := 0; i < len(s); i++ {
|
|
switch s[i] {
|
|
case '%':
|
|
c := unhex(s[i+1])<<4 | unhex(s[i+2])
|
|
if shouldUnescapeWithMode(c, mode) {
|
|
t.WriteByte(c)
|
|
i += 2
|
|
continue
|
|
}
|
|
fallthrough
|
|
default:
|
|
t.WriteByte(s[i])
|
|
}
|
|
}
|
|
|
|
return t.String(), nil
|
|
}
|