Support for connection attributes #350
+143
−30
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -17,6 +17,9 @@ import ( | ||
| "fmt" | ||
| "io" | ||
| "math" | ||
| "os" | ||
| "path" | ||
| "runtime" | ||
| "time" | ||
| ) | ||
|
|
||
| @@ -175,10 +178,15 @@ func (mc *mysqlConn) readInitPacket() ([]byte, error) { | ||
| if len(data) > pos { | ||
| // character set [1 byte] | ||
| // status flags [2 bytes] | ||
| pos += 1 + 2 | ||
|
|
||
| // capability flags (upper 2 bytes) [2 bytes] | ||
| mc.flags |= (clientFlag(binary.LittleEndian.Uint16(data[pos:pos+2])) << 16) | ||
| pos += 2 | ||
|
|
||
| // length of auth-plugin-data [1 byte] | ||
| // reserved (all [00]) [10 bytes] | ||
| pos += 1 + 10 | ||
|
|
||
| // second part of the password cipher [mininum 13 bytes], | ||
| // where len=MAX(13, length of auth-plugin-data - 8) | ||
| @@ -246,6 +254,40 @@ func (mc *mysqlConn) writeAuthPacket(cipher []byte) error { | ||
|
|
||
| pktLen := 4 + 4 + 1 + 23 + len(mc.cfg.User) + 1 + 1 + len(scrambleBuff) + 21 + 1 | ||
|
|
||
| // Default connection attributes | ||
| attrlen := 0 | ||
| var attrs map[string]string | ||
| if mc.flags&clientConnectAttrs != 0 { | ||
| clientFlags |= clientConnectAttrs | ||
|
|
||
| attrs = map[string]string{ | ||
| "_os": runtime.GOOS, | ||
| "_client_name": "Go-MySQL-Driver", | ||
| "_pid": pid, | ||
| "_platform": runtime.GOARCH, | ||
| "program_name": path.Base(os.Args[0]), | ||
|
There was a problem hiding this comment. If someone would like to override program_name that would be difficult There was a problem hiding this comment. However |
||
| } | ||
| if len(os_user_full) > 0 { | ||
| attrs["_os_user_full"] = os_user_full | ||
| } | ||
| if len(os_user) > 0 { | ||
| attrs["_os_user"] = os_user | ||
| } | ||
|
|
||
| // Merge the custom attributes and the default attributes | ||
| for cfganame, cfgaval := range mc.cfg.ConnAttrs { | ||
| attrs[cfganame] = cfgaval | ||
| } | ||
|
|
||
| for attrname, attrvalue := range attrs { | ||
| attrlen += len(attrname) + len(attrvalue) | ||
| // one byte to store attrname length and one byte to store attrvalue length | ||
| attrlen += 2 | ||
| } | ||
|
|
||
| pktLen += attrlen + 1 // one byte to store the total length of attrs | ||
| } | ||
|
|
||
| // To specify a db name | ||
| if n := len(mc.cfg.DBName); n > 0 { | ||
| clientFlags |= clientConnectWithDB | ||
| @@ -326,6 +368,21 @@ func (mc *mysqlConn) writeAuthPacket(cipher []byte) error { | ||
| // Assume native client during response | ||
| pos += copy(data[pos:], "mysql_native_password") | ||
| data[pos] = 0x00 | ||
| pos++ | ||
|
|
||
| // Connection attributes | ||
| if attrlen > 0 { | ||
| data[pos] = byte(attrlen) | ||
| pos++ | ||
|
|
||
| for attrname, attrvalue := range attrs { | ||
|
There was a problem hiding this comment. @dveeden That is what I meant. You could directly pack this into one byte sequence / string when the params are parsed. But forget that, the Config is exported for a reason now. |
||
| data[pos] = byte(len(attrname)) | ||
| pos += 1 + copy(data[pos+1:], attrname) | ||
|
|
||
| data[pos] = byte(len(attrvalue)) | ||
| pos += 1 + copy(data[pos+1:], attrvalue) | ||
| } | ||
| } | ||
|
|
||
| // Send Auth packet | ||
| return mc.writePacket(data) | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wrong naming convention
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Filed #442 for this lint issue.