Skip to content

Added ServerSession to HandleAuthorRequest and HandleAcctRequest #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wladwm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added ServerSession to HandleAuthorRequest and HandleAcctRequest #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ func (s *ServerSession) LocalAddr() net.Addr {
// HandleAcctRequest processes an accounting request, returning an optional reply.
type RequestHandler interface {
HandleAuthenStart(ctx context.Context, a *AuthenStart, s *ServerSession) *AuthenReply
HandleAuthorRequest(ctx context.Context, a *AuthorRequest) *AuthorResponse
HandleAcctRequest(ctx context.Context, a *AcctRequest) *AcctReply
HandleAuthorRequest(ctx context.Context, a *AuthorRequest, s *ServerSession) *AuthorResponse
HandleAcctRequest(ctx context.Context, a *AcctRequest, s *ServerSession) *AcctReply
}

// A ServerConnHandler serves TACACS+ requests on a network connection.
Expand Down Expand Up @@ -171,7 +171,7 @@ func (h *ServerConnHandler) handleAuthenStart(ctx context.Context, s *ServerSess
return s.p, err
}

func (h *ServerConnHandler) handleAuthorRequest(ctx context.Context, p []byte) ([]byte, error) {
func (h *ServerConnHandler) handleAuthorRequest(ctx context.Context, p []byte, s *ServerSession) ([]byte, error) {
ar := new(AuthorRequest)
err := ar.unmarshal(p[hdrLen:])
if err != nil {
Expand All @@ -182,7 +182,7 @@ func (h *ServerConnHandler) handleAuthorRequest(ctx context.Context, p []byte) (
p[hdrVer] = verDefault
return p, err
}
reply := h.Handler.HandleAuthorRequest(ctx, ar)
reply := h.Handler.HandleAuthorRequest(ctx, ar, s)
if reply == nil {
return nil, nil
}
Expand All @@ -193,7 +193,7 @@ func (h *ServerConnHandler) handleAuthorRequest(ctx context.Context, p []byte) (
return p, err
}

func (h *ServerConnHandler) handleAcctRequest(ctx context.Context, p []byte) ([]byte, error) {
func (h *ServerConnHandler) handleAcctRequest(ctx context.Context, p []byte, s *ServerSession) ([]byte, error) {
ar := new(AcctRequest)
err := ar.unmarshal(p[hdrLen:])
if err != nil {
Expand All @@ -204,7 +204,7 @@ func (h *ServerConnHandler) handleAcctRequest(ctx context.Context, p []byte) ([]
p[hdrVer] = verDefault
return p, err
}
reply := h.Handler.HandleAcctRequest(ctx, ar)
reply := h.Handler.HandleAcctRequest(ctx, ar, s)
if reply == nil {
return nil, nil
}
Expand Down Expand Up @@ -233,9 +233,9 @@ func (h *ServerConnHandler) serveSession(sess *session) {
case sessTypeAuthen:
s.p, err = h.handleAuthenStart(s.context(), s)
case sessTypeAuthor:
s.p, err = h.handleAuthorRequest(s.context(), s.p)
s.p, err = h.handleAuthorRequest(s.context(), s.p, s)
case sessTypeAcct:
s.p, err = h.handleAcctRequest(s.context(), s.p)
s.p, err = h.handleAcctRequest(s.context(), s.p, s)
default:
err = fmt.Errorf("invalid session type %d", s.p[hdrType])
}
Expand Down