Skip to content

Fix StartTLS #7

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
ejona86 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix StartTLS #7

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
20 changes: 12 additions & 8 deletions conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,14 @@ func (l *LDAPConnection) Connect() error {
l.conn = c
}
}
l.start()
l.connected = true
if l.IsTLS {
err := l.startTLS()
if err != nil {
return err
}
}
l.start()
l.connected = true
return nil
}

Expand Down Expand Up @@ -180,10 +180,7 @@ func (l *LDAPConnection) nextMessageID() (messageID uint64, ok bool) {

// StartTLS sends the command to start a TLS session and then creates a new TLS Client
func (l *LDAPConnection) startTLS() error {
messageID, ok := l.nextMessageID()
if !ok {
return NewLDAPError(ErrorClosing, "MessageID channel is closed.")
}
messageID := uint64(1)

if l.IsSSL {
return NewLDAPError(ErrorNetwork, "Already encrypted")
Expand All @@ -196,10 +193,17 @@ func (l *LDAPConnection) startTLS() error {
return err
}

err = l.sendReqRespPacket(messageID, packet)
_, err = l.conn.Write(packet.Bytes())
if err != nil {
return err
}
p, err := ber.ReadPacket(l.conn)
addLDAPDescriptions(p)
result_code, result_description := getLDAPResultCode(p)

if result_code != 0 {
return NewLDAPError(result_code, result_description)
}

conn := tls.Client(l.conn, l.TlsConfig)
err = conn.Handshake()
Expand Down Expand Up @@ -281,7 +285,7 @@ func (l *LDAPConnection) processMessages() {
// will shutdown reader.
l.conn.Close()
}()
var message_id uint64 = 1
var message_id uint64 = 2 // Reserve '1' for startTLS
var message_packet *messagePacket

for {
Expand Down