Add debug log to HandleDial, remove OpRegister
Log original and normalized target number to debug 'target offline'. Remove unused OpRegister opcode and handler.
This commit is contained in:
parent
07814e5014
commit
8726dcc01e
3 changed files with 6 additions and 42 deletions
|
|
@ -130,9 +130,15 @@ func (m *Manager) HandleDial(sess CallSession, payload []byte) {
|
|||
sendError(sess, types.ErrInvalidRequest, "empty target number")
|
||||
return
|
||||
}
|
||||
origTarget := targetNumber
|
||||
targetNumber = identity.NormalizeNumber(targetNumber)
|
||||
|
||||
fromNumber := sess.Number()
|
||||
m.logger.Debug("Dial request",
|
||||
zap.String("from", fromNumber),
|
||||
zap.String("target_orig", origTarget),
|
||||
zap.String("target_norm", targetNumber))
|
||||
|
||||
if fromNumber == targetNumber {
|
||||
sendError(sess, types.ErrSelfCall, "cannot call yourself")
|
||||
return
|
||||
|
|
|
|||
|
|
@ -217,8 +217,6 @@ func (s *Server) handleStream(ctx context.Context, stream *quic.Stream, sess *Se
|
|||
s.handleReroll(sess)
|
||||
case types.OpAuthCert:
|
||||
s.handleAuthCert(sess, frame.Payload)
|
||||
case types.OpRegister:
|
||||
s.handleRegister(sess, frame.Payload)
|
||||
case types.OpDial:
|
||||
if !sess.IsAuthenticated() {
|
||||
sendOpError(st, types.ErrInvalidRequest, "not authenticated")
|
||||
|
|
@ -369,45 +367,6 @@ func (s *Server) handleAuthCert(sess *Session, payload []byte) {
|
|||
zap.String("number", ident.Number))
|
||||
}
|
||||
|
||||
func (s *Server) handleRegister(sess *Session, payload []byte) {
|
||||
if len(payload) < 32 {
|
||||
sendOpError(sess.Stream(), types.ErrInvalidRequest, "invalid pubkey")
|
||||
return
|
||||
}
|
||||
|
||||
var pubKey [32]byte
|
||||
copy(pubKey[:], payload[:32])
|
||||
|
||||
if _, err := s.identMgr.GetByPubKey(pubKey); err == nil {
|
||||
sendOpError(sess.Stream(), types.ErrInvalidRequest, "already registered")
|
||||
return
|
||||
}
|
||||
|
||||
ident, err := s.identMgr.Allocate(pubKey)
|
||||
if err != nil {
|
||||
sendOpError(sess.Stream(), types.ErrInternal, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
certDER, err := s.ca.IssueCert(ident.Number, ed25519.PublicKey(pubKey[:]), s.cfg.CA.Validity)
|
||||
if err != nil {
|
||||
sendOpError(sess.Stream(), types.ErrInternal, "cert issuance failed")
|
||||
return
|
||||
}
|
||||
ident.CertDER = certDER
|
||||
|
||||
sess.Authenticate(ident.Number, pubKey, certDER)
|
||||
s.Register(sess, ident.Number)
|
||||
|
||||
payload = marshalIdentityResponse(ident.Number, certDER, s.ca.CACertPEM())
|
||||
if st := sess.Stream(); st != nil {
|
||||
st.WriteFrame(byte(types.OpIdentity), payload)
|
||||
}
|
||||
|
||||
s.logger.Info("Client registered",
|
||||
zap.String("number", ident.Number))
|
||||
}
|
||||
|
||||
func (s *Server) handleReroll(sess *Session) {
|
||||
if !sess.IsAuthenticated() {
|
||||
sendOpError(sess.Stream(), types.ErrInvalidRequest, "not authenticated")
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ const (
|
|||
OpIdentity OpCode = 0x04
|
||||
OpReroll OpCode = 0x05
|
||||
OpAuthCert OpCode = 0x06
|
||||
OpRegister OpCode = 0x07
|
||||
|
||||
OpDial OpCode = 0x10
|
||||
OpRing OpCode = 0x11
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue