@@ -27,7 +27,7 @@ require ( | |||
github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d // indirect | |||
github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 // indirect | |||
github.com/cznic/strutil v0.0.0-20181122101858-275e90344537 // indirect | |||
github.com/denisenkom/go-mssqldb v0.0.0-20190820223206-44cdfe8d8ba9 | |||
github.com/denisenkom/go-mssqldb v0.0.0-20190924004331-208c0a498538 | |||
github.com/dgrijalva/jwt-go v3.2.0+incompatible | |||
github.com/emirpasic/gods v1.12.0 | |||
github.com/etcd-io/bbolt v1.3.2 // indirect | |||
@@ -64,7 +64,7 @@ require ( | |||
github.com/klauspost/compress v0.0.0-20161025140425-8df558b6cb6f | |||
github.com/klauspost/cpuid v0.0.0-20160302075316-09cded8978dc // indirect | |||
github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6 // indirect | |||
github.com/lafriks/xormstore v1.2.0 | |||
github.com/lafriks/xormstore v1.3.0 | |||
github.com/lib/pq v1.2.0 | |||
github.com/lunny/dingtalk_webhook v0.0.0-20171025031554-e3534c89ef96 | |||
github.com/lunny/levelqueue v0.0.0-20190217115915-02b525a4418e | |||
@@ -104,16 +104,14 @@ require ( | |||
github.com/urfave/cli v1.20.0 | |||
github.com/willf/bitset v0.0.0-20180426185212-8ce1146b8621 // indirect | |||
github.com/yohcop/openid-go v0.0.0-20160914080427-2c050d2dae53 | |||
golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 | |||
golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad | |||
golang.org/x/net v0.0.0-20190909003024-a7b16738d86b | |||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 | |||
golang.org/x/sys v0.0.0-20190910064555-bbd175535a8b | |||
golang.org/x/text v0.3.2 | |||
golang.org/x/tools v0.0.0-20190910221609-7f5965fd7709 // indirect | |||
google.golang.org/appengine v1.6.2 // indirect | |||
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect | |||
gopkg.in/asn1-ber.v1 v1.0.0-20150924051756-4e86f4367175 // indirect | |||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect | |||
gopkg.in/editorconfig/editorconfig-core-go.v1 v1.3.0 | |||
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df | |||
gopkg.in/ini.v1 v1.46.0 |
@@ -123,8 +123,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs | |||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= | |||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | |||
github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= | |||
github.com/denisenkom/go-mssqldb v0.0.0-20190820223206-44cdfe8d8ba9 h1:r05vdZzhwcLFTrNCNirAQEL30b/tlqnI0ow7BCcUiT4= | |||
github.com/denisenkom/go-mssqldb v0.0.0-20190820223206-44cdfe8d8ba9/go.mod h1:uU0N10vx1abI4qeVe79CxepBP6PPREVTgMS5Gx6/mOk= | |||
github.com/denisenkom/go-mssqldb v0.0.0-20190924004331-208c0a498538 h1:bpWCJ5MddHsv4Xtl3azkK89mZzd/vvut32mvAnKbyUA= | |||
github.com/denisenkom/go-mssqldb v0.0.0-20190924004331-208c0a498538/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= | |||
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= | |||
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= | |||
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= | |||
@@ -249,7 +249,6 @@ github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013 h1:l | |||
github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013/go.mod h1:b65mBPzqzZWxOZGxSWrqs4GInLIn+u99Q9q7p+GKni0= | |||
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y= | |||
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM= | |||
github.com/go-xorm/xorm v0.7.6/go.mod h1:nqz2TAsuOHWH2yk4FYWtacCGgdbrcdZ5mF1XadqEHls= | |||
github.com/go-xorm/xorm v0.7.8 h1:rKxZJB9mWQ9Nw2TbjsepiThR031jkGePOWXwTtEAU08= | |||
github.com/go-xorm/xorm v0.7.8/go.mod h1:XiVxrMMIhFkwSkh96BW7PACl7UhLtx2iJIHMdmjh5sQ= | |||
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= | |||
@@ -262,6 +261,8 @@ github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a | |||
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= | |||
github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14 h1:yXtpJr/LV6PFu4nTLgfjQdcMdzjbqqXMEnHfq0Or6p8= | |||
github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14/go.mod h1:jPoNZLWDAqA5N3G5amEoiNbhVrmM+ZQEcnQvNQ2KaZk= | |||
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= | |||
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= | |||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= | |||
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= | |||
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= | |||
@@ -338,10 +339,6 @@ github.com/issue9/identicon v0.0.0-20160320065130-d36b54562f4c h1:A/PDn117UYld5m | |||
github.com/issue9/identicon v0.0.0-20160320065130-d36b54562f4c/go.mod h1:5mTb/PQNkqmq2x3IxlQZE0aSnTksJg7fg/oWmJ5SKXQ= | |||
github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc= | |||
github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ= | |||
github.com/jackc/pgx v3.3.0+incompatible h1:Wa90/+qsITBAPkAZjiByeIGHFcj3Ztu+VzrrIpHjL90= | |||
github.com/jackc/pgx v3.3.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= | |||
github.com/jackc/pgx v3.5.0+incompatible h1:BRJ4G3UPtvml5R1ey0biqqGuYUGayMYekm3woO75orY= | |||
github.com/jackc/pgx v3.5.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= | |||
github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= | |||
github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod h1:ks+b9deReOc7jgqp+e7LuFiCBH6Rm5hL32cLcEAArb4= | |||
github.com/jaytaylor/html2text v0.0.0-20160923191438-8fb95d837f7d h1:ig/iUfDDg06RVW8OMby+GrmW6K2nPO3AFHlEIdvJSd4= | |||
@@ -387,8 +384,8 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= | |||
github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= | |||
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= | |||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= | |||
github.com/lafriks/xormstore v1.2.0 h1:3L1lbjpLAAE+91vU3yPlXhHfnYnhxAklFUi2eiMalc4= | |||
github.com/lafriks/xormstore v1.2.0/go.mod h1:g47/cl3RfWykO5c4nw/Io3N0R+JuDqiD2YY7NzfWDoU= | |||
github.com/lafriks/xormstore v1.3.0 h1:9A2wAZrdEXtTgfjCFtclPz3pwnmmxY7sJxQgIi62li4= | |||
github.com/lafriks/xormstore v1.3.0/go.mod h1:RAhtOztWBjK9xeZpXwKq59rhUxoRgo1zfYl0H1mtK7A= | |||
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= | |||
github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0= | |||
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= | |||
@@ -628,10 +625,8 @@ golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8U | |||
golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | |||
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc= | |||
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | |||
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0= | |||
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | |||
golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 h1:Gv7RPwsi3eZ2Fgewe3CBsuOebPwO27PoXzRpJPsvSSM= | |||
golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | |||
golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad h1:5E5raQxcv+6CZ11RrBYQe5WRbUIWpScjh0kvHZkZIrQ= | |||
golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | |||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= | |||
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= | |||
golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= | |||
@@ -699,7 +694,6 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w | |||
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | |||
golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | |||
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | |||
golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | |||
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | |||
golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | |||
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | |||
@@ -729,7 +723,6 @@ golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3 | |||
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= | |||
golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= | |||
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= | |||
golang.org/x/tools v0.0.0-20190606050223-4d9ae51c2468/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= | |||
golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= | |||
golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= | |||
golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= | |||
@@ -754,8 +747,8 @@ google.golang.org/appengine v1.6.0 h1:Tfd7cKwKbFRsI8RMAD3oqqw7JPFRrvFlOsfbgVkjOO | |||
google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= | |||
google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I= | |||
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= | |||
google.golang.org/appengine v1.6.2 h1:j8RI1yW0SkI+paT6uGwMlrMI/6zwYA6/CFil8rxOzGI= | |||
google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= | |||
google.golang.org/appengine v1.6.4 h1:WiKh4+/eMB2HaY7QhCfW/R7MuRAoA8QMCSJA6jP5/fo= | |||
google.golang.org/appengine v1.6.4/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= | |||
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= | |||
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= | |||
google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= | |||
@@ -824,12 +817,8 @@ mvdan.cc/xurls/v2 v2.0.0/go.mod h1:2/webFPYOXN9jp/lzuj0zuAVlF+9g4KPFJANH1oJhRU= | |||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= | |||
strk.kbt.io/projects/go/libravatar v0.0.0-20160628055650-5eed7bff870a h1:8q33ShxKXRwQ7JVd1ZnhIU3hZhwwn0Le+4fTeAackuM= | |||
strk.kbt.io/projects/go/libravatar v0.0.0-20160628055650-5eed7bff870a/go.mod h1:FJGmPh3vz9jSos1L/F91iAgnC/aejc0wIIrF2ZwJxdY= | |||
xorm.io/builder v0.3.5 h1:EilU39fvWDxjb1cDaELpYhsF+zziRBhew8xk4pngO+A= | |||
xorm.io/builder v0.3.5/go.mod h1:ZFbByS/KxZI1FKRjL05PyJ4YrK2bcxlUaAxdum5aTR8= | |||
xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8= | |||
xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU= | |||
xorm.io/core v0.7.0 h1:hKxuOKWZNeiFQsSuGet/KV8HZ788hclvAl+7azx3tkM= | |||
xorm.io/core v0.7.0/go.mod h1:TuOJjIVa7e3w/rN8tDcAvuLBMtwzdHPbyOzE6Gk1EUI= | |||
xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb h1:msX3zG3BPl8Ti+LDzP33/9K7BzO/WqFXk610K1kYKfo= | |||
xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM= | |||
xorm.io/core v0.7.2 h1:mEO22A2Z7a3fPaZMk6gKL/jMD80iiyNwRrX5HOv3XLw= |
@@ -220,9 +220,9 @@ are supported: | |||
* time.Time -> datetimeoffset or datetime (TDS version dependent) | |||
* mssql.DateTime1 -> datetime | |||
* mssql.DateTimeOffset -> datetimeoffset | |||
* "cloud.google.com/go/civil".Date -> date | |||
* "cloud.google.com/go/civil".DateTime -> datetime2 | |||
* "cloud.google.com/go/civil".Time -> time | |||
* "github.com/golang-sql/civil".Date -> date | |||
* "github.com/golang-sql/civil".DateTime -> datetime2 | |||
* "github.com/golang-sql/civil".Time -> time | |||
* mssql.TVP -> Table Value Parameter (TDS version dependent) | |||
## Important Notes |
@@ -10,7 +10,7 @@ environment: | |||
SQLUSER: sa | |||
SQLPASSWORD: Password12! | |||
DATABASE: test | |||
GOVERSION: 110 | |||
GOVERSION: 111 | |||
matrix: | |||
- GOVERSION: 18 | |||
SQLINSTANCE: SQL2016 | |||
@@ -18,6 +18,8 @@ environment: | |||
SQLINSTANCE: SQL2016 | |||
- GOVERSION: 110 | |||
SQLINSTANCE: SQL2016 | |||
- GOVERSION: 111 | |||
SQLINSTANCE: SQL2016 | |||
- SQLINSTANCE: SQL2014 | |||
- SQLINSTANCE: SQL2012SP1 | |||
- SQLINSTANCE: SQL2008R2SP2 | |||
@@ -27,7 +29,7 @@ install: | |||
- set PATH=%GOPATH%\bin;%GOROOT%\bin;%PATH% | |||
- go version | |||
- go env | |||
- go get -u cloud.google.com/go/civil | |||
- go get -u github.com/golang-sql/civil | |||
build_script: | |||
- go build |
@@ -221,23 +221,27 @@ func (r *tdsBuffer) uint16() uint16 { | |||
} | |||
func (r *tdsBuffer) BVarChar() string { | |||
l := int(r.byte()) | |||
return r.readUcs2(l) | |||
return readBVarCharOrPanic(r) | |||
} | |||
func (r *tdsBuffer) UsVarChar() string { | |||
l := int(r.uint16()) | |||
return r.readUcs2(l) | |||
func readBVarCharOrPanic(r io.Reader) string { | |||
s, err := readBVarChar(r) | |||
if err != nil { | |||
badStreamPanic(err) | |||
} | |||
return s | |||
} | |||
func (r *tdsBuffer) readUcs2(numchars int) string { | |||
b := make([]byte, numchars*2) | |||
r.ReadFull(b) | |||
res, err := ucs22str(b) | |||
func readUsVarCharOrPanic(r io.Reader) string { | |||
s, err := readUsVarChar(r) | |||
if err != nil { | |||
badStreamPanic(err) | |||
} | |||
return res | |||
return s | |||
} | |||
func (r *tdsBuffer) UsVarChar() string { | |||
return readUsVarCharOrPanic(r) | |||
} | |||
func (r *tdsBuffer) Read(buf []byte) (copied int, err error) { |
@@ -7,9 +7,10 @@ import ( | |||
"fmt" | |||
"math" | |||
"reflect" | |||
"strconv" | |||
"strings" | |||
"time" | |||
"github.com/denisenkom/go-mssqldb/internal/decimal" | |||
) | |||
type Bulk struct { | |||
@@ -42,6 +43,11 @@ type BulkOptions struct { | |||
type DataValue interface{} | |||
const ( | |||
sqlDateFormat = "2006-01-02" | |||
sqlTimeFormat = "2006-01-02 15:04:05.999999999Z07:00" | |||
) | |||
func (cn *Conn) CreateBulk(table string, columns []string) (_ *Bulk) { | |||
b := Bulk{ctx: context.Background(), cn: cn, tablename: table, headerSent: false, columnsName: columns} | |||
b.Debug = false | |||
@@ -334,7 +340,7 @@ func (b *Bulk) makeParam(val DataValue, col columnStruct) (res param, err error) | |||
case int64: | |||
intvalue = val | |||
default: | |||
err = fmt.Errorf("mssql: invalid type for int column") | |||
err = fmt.Errorf("mssql: invalid type for int column: %T", val) | |||
return | |||
} | |||
@@ -361,7 +367,7 @@ func (b *Bulk) makeParam(val DataValue, col columnStruct) (res param, err error) | |||
case int64: | |||
floatvalue = float64(val) | |||
default: | |||
err = fmt.Errorf("mssql: invalid type for float column: %s", val) | |||
err = fmt.Errorf("mssql: invalid type for float column: %T %s", val, val) | |||
return | |||
} | |||
@@ -380,7 +386,7 @@ func (b *Bulk) makeParam(val DataValue, col columnStruct) (res param, err error) | |||
case []byte: | |||
res.buffer = val | |||
default: | |||
err = fmt.Errorf("mssql: invalid type for nvarchar column: %s", val) | |||
err = fmt.Errorf("mssql: invalid type for nvarchar column: %T %s", val, val) | |||
return | |||
} | |||
res.ti.Size = len(res.buffer) | |||
@@ -392,14 +398,14 @@ func (b *Bulk) makeParam(val DataValue, col columnStruct) (res param, err error) | |||
case []byte: | |||
res.buffer = val | |||
default: | |||
err = fmt.Errorf("mssql: invalid type for varchar column: %s", val) | |||
err = fmt.Errorf("mssql: invalid type for varchar column: %T %s", val, val) | |||
return | |||
} | |||
res.ti.Size = len(res.buffer) | |||
case typeBit, typeBitN: | |||
if reflect.TypeOf(val).Kind() != reflect.Bool { | |||
err = fmt.Errorf("mssql: invalid type for bit column: %s", val) | |||
err = fmt.Errorf("mssql: invalid type for bit column: %T %s", val, val) | |||
return | |||
} | |||
res.ti.TypeId = typeBitN | |||
@@ -413,18 +419,31 @@ func (b *Bulk) makeParam(val DataValue, col columnStruct) (res param, err error) | |||
case time.Time: | |||
res.buffer = encodeDateTime2(val, int(col.ti.Scale)) | |||
res.ti.Size = len(res.buffer) | |||
case string: | |||
var t time.Time | |||
if t, err = time.Parse(sqlTimeFormat, val); err != nil { | |||
return res, fmt.Errorf("bulk: unable to convert string to date: %v", err) | |||
} | |||
res.buffer = encodeDateTime2(t, int(col.ti.Scale)) | |||
res.ti.Size = len(res.buffer) | |||
default: | |||
err = fmt.Errorf("mssql: invalid type for datetime2 column: %s", val) | |||
err = fmt.Errorf("mssql: invalid type for datetime2 column: %T %s", val, val) | |||
return | |||
} | |||
case typeDateTimeOffsetN: | |||
switch val := val.(type) { | |||
case time.Time: | |||
res.buffer = encodeDateTimeOffset(val, int(res.ti.Scale)) | |||
res.buffer = encodeDateTimeOffset(val, int(col.ti.Scale)) | |||
res.ti.Size = len(res.buffer) | |||
case string: | |||
var t time.Time | |||
if t, err = time.Parse(sqlTimeFormat, val); err != nil { | |||
return res, fmt.Errorf("bulk: unable to convert string to date: %v", err) | |||
} | |||
res.buffer = encodeDateTimeOffset(t, int(col.ti.Scale)) | |||
res.ti.Size = len(res.buffer) | |||
default: | |||
err = fmt.Errorf("mssql: invalid type for datetimeoffset column: %s", val) | |||
err = fmt.Errorf("mssql: invalid type for datetimeoffset column: %T %s", val, val) | |||
return | |||
} | |||
case typeDateN: | |||
@@ -432,69 +451,79 @@ func (b *Bulk) makeParam(val DataValue, col columnStruct) (res param, err error) | |||
case time.Time: | |||
res.buffer = encodeDate(val) | |||
res.ti.Size = len(res.buffer) | |||
case string: | |||
var t time.Time | |||
if t, err = time.ParseInLocation(sqlDateFormat, val, time.UTC); err != nil { | |||
return res, fmt.Errorf("bulk: unable to convert string to date: %v", err) | |||
} | |||
res.buffer = encodeDate(t) | |||
res.ti.Size = len(res.buffer) | |||
default: | |||
err = fmt.Errorf("mssql: invalid type for date column: %s", val) | |||
err = fmt.Errorf("mssql: invalid type for date column: %T %s", val, val) | |||
return | |||
} | |||
case typeDateTime, typeDateTimeN, typeDateTim4: | |||
var t time.Time | |||
switch val := val.(type) { | |||
case time.Time: | |||
if col.ti.Size == 4 { | |||
res.buffer = encodeDateTim4(val) | |||
res.ti.Size = len(res.buffer) | |||
} else if col.ti.Size == 8 { | |||
res.buffer = encodeDateTime(val) | |||
res.ti.Size = len(res.buffer) | |||
} else { | |||
err = fmt.Errorf("mssql: invalid size of column") | |||
t = val | |||
case string: | |||
if t, err = time.Parse(sqlTimeFormat, val); err != nil { | |||
return res, fmt.Errorf("bulk: unable to convert string to date: %v", err) | |||
} | |||
default: | |||
err = fmt.Errorf("mssql: invalid type for datetime column: %s", val) | |||
err = fmt.Errorf("mssql: invalid type for datetime column: %T %s", val, val) | |||
return | |||
} | |||
if col.ti.Size == 4 { | |||
res.buffer = encodeDateTim4(t) | |||
res.ti.Size = len(res.buffer) | |||
} else if col.ti.Size == 8 { | |||
res.buffer = encodeDateTime(t) | |||
res.ti.Size = len(res.buffer) | |||
} else { | |||
err = fmt.Errorf("mssql: invalid size of column %d", col.ti.Size) | |||
} | |||
// case typeMoney, typeMoney4, typeMoneyN: | |||
case typeDecimal, typeDecimalN, typeNumeric, typeNumericN: | |||
var value float64 | |||
prec := col.ti.Prec | |||
scale := col.ti.Scale | |||
var dec decimal.Decimal | |||
switch v := val.(type) { | |||
case int: | |||
value = float64(v) | |||
dec = decimal.Int64ToDecimalScale(int64(v), 0) | |||
case int8: | |||
value = float64(v) | |||
dec = decimal.Int64ToDecimalScale(int64(v), 0) | |||
case int16: | |||
value = float64(v) | |||
dec = decimal.Int64ToDecimalScale(int64(v), 0) | |||
case int32: | |||
value = float64(v) | |||
dec = decimal.Int64ToDecimalScale(int64(v), 0) | |||
case int64: | |||
value = float64(v) | |||
dec = decimal.Int64ToDecimalScale(int64(v), 0) | |||
case float32: | |||
value = float64(v) | |||
dec, err = decimal.Float64ToDecimalScale(float64(v), scale) | |||
case float64: | |||
value = v | |||
dec, err = decimal.Float64ToDecimalScale(float64(v), scale) | |||
case string: | |||
if value, err = strconv.ParseFloat(v, 64); err != nil { | |||
return res, fmt.Errorf("bulk: unable to convert string to float: %v", err) | |||
} | |||
dec, err = decimal.StringToDecimalScale(v, scale) | |||
default: | |||
return res, fmt.Errorf("unknown value for decimal: %#v", v) | |||
return res, fmt.Errorf("unknown value for decimal: %T %#v", v, v) | |||
} | |||
perc := col.ti.Prec | |||
scale := col.ti.Scale | |||
var dec Decimal | |||
dec, err = Float64ToDecimalScale(value, scale) | |||
if err != nil { | |||
return res, err | |||
} | |||
dec.prec = perc | |||
dec.SetPrec(prec) | |||
var length byte | |||
switch { | |||
case perc <= 9: | |||
case prec <= 9: | |||
length = 4 | |||
case perc <= 19: | |||
case prec <= 19: | |||
length = 8 | |||
case perc <= 28: | |||
case prec <= 28: | |||
length = 12 | |||
default: | |||
length = 16 | |||
@@ -504,7 +533,7 @@ func (b *Bulk) makeParam(val DataValue, col columnStruct) (res param, err error) | |||
// first byte length written by typeInfo.writer | |||
res.ti.Size = int(length) + 1 | |||
// second byte sign | |||
if value < 0 { | |||
if !dec.IsPositive() { | |||
buf[0] = 0 | |||
} else { | |||
buf[0] = 1 | |||
@@ -527,7 +556,7 @@ func (b *Bulk) makeParam(val DataValue, col columnStruct) (res param, err error) | |||
res.ti.Size = len(val) | |||
res.buffer = val | |||
default: | |||
err = fmt.Errorf("mssql: invalid type for Binary column: %s", val) | |||
err = fmt.Errorf("mssql: invalid type for Binary column: %T %s", val, val) | |||
return | |||
} | |||
case typeGuid: | |||
@@ -536,7 +565,7 @@ func (b *Bulk) makeParam(val DataValue, col columnStruct) (res param, err error) | |||
res.ti.Size = len(val) | |||
res.buffer = val | |||
default: | |||
err = fmt.Errorf("mssql: invalid type for Guid column: %s", val) | |||
err = fmt.Errorf("mssql: invalid type for Guid column: %T %s", val, val) | |||
return | |||
} | |||
@@ -0,0 +1,453 @@ | |||
package mssql | |||
import ( | |||
"fmt" | |||
"net" | |||
"net/url" | |||
"os" | |||
"strconv" | |||
"strings" | |||
"time" | |||
"unicode" | |||
) | |||
type connectParams struct { | |||
logFlags uint64 | |||
port uint64 | |||
host string | |||
instance string | |||
database string | |||
user string | |||
password string | |||
dial_timeout time.Duration | |||
conn_timeout time.Duration | |||
keepAlive time.Duration | |||
encrypt bool | |||
disableEncryption bool | |||
trustServerCertificate bool | |||
certificate string | |||
hostInCertificate string | |||
hostInCertificateProvided bool | |||
serverSPN string | |||
workstation string | |||
appname string | |||
typeFlags uint8 | |||
failOverPartner string | |||
failOverPort uint64 | |||
packetSize uint16 | |||
} | |||
func parseConnectParams(dsn string) (connectParams, error) { | |||
var p connectParams | |||
var params map[string]string | |||
if strings.HasPrefix(dsn, "odbc:") { | |||
parameters, err := splitConnectionStringOdbc(dsn[len("odbc:"):]) | |||
if err != nil { | |||
return p, err | |||
} | |||
params = parameters | |||
} else if strings.HasPrefix(dsn, "sqlserver://") { | |||
parameters, err := splitConnectionStringURL(dsn) | |||
if err != nil { | |||
return p, err | |||
} | |||
params = parameters | |||
} else { | |||
params = splitConnectionString(dsn) | |||
} | |||
strlog, ok := params["log"] | |||
if ok { | |||
var err error | |||
p.logFlags, err = strconv.ParseUint(strlog, 10, 64) | |||
if err != nil { | |||
return p, fmt.Errorf("Invalid log parameter '%s': %s", strlog, err.Error()) | |||
} | |||
} | |||
server := params["server"] | |||
parts := strings.SplitN(server, `\`, 2) | |||
p.host = parts[0] | |||
if p.host == "." || strings.ToUpper(p.host) == "(LOCAL)" || p.host == "" { | |||
p.host = "localhost" | |||
} | |||
if len(parts) > 1 { | |||
p.instance = parts[1] | |||
} | |||
p.database = params["database"] | |||
p.user = params["user id"] | |||
p.password = params["password"] | |||
p.port = 1433 | |||
strport, ok := params["port"] | |||
if ok { | |||
var err error | |||
p.port, err = strconv.ParseUint(strport, 10, 16) | |||
if err != nil { | |||
f := "Invalid tcp port '%v': %v" | |||
return p, fmt.Errorf(f, strport, err.Error()) | |||
} | |||
} | |||
// https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/configure-the-network-packet-size-server-configuration-option | |||
// Default packet size remains at 4096 bytes | |||
p.packetSize = 4096 | |||
strpsize, ok := params["packet size"] | |||
if ok { | |||
var err error | |||
psize, err := strconv.ParseUint(strpsize, 0, 16) | |||
if err != nil { | |||
f := "Invalid packet size '%v': %v" | |||
return p, fmt.Errorf(f, strpsize, err.Error()) | |||
} | |||
// Ensure packet size falls within the TDS protocol range of 512 to 32767 bytes | |||
// NOTE: Encrypted connections have a maximum size of 16383 bytes. If you request | |||
// a higher packet size, the server will respond with an ENVCHANGE request to | |||
// alter the packet size to 16383 bytes. | |||
p.packetSize = uint16(psize) | |||
if p.packetSize < 512 { | |||
p.packetSize = 512 | |||
} else if p.packetSize > 32767 { | |||
p.packetSize = 32767 | |||
} | |||
} | |||
// https://msdn.microsoft.com/en-us/library/dd341108.aspx | |||
// | |||
// Do not set a connection timeout. Use Context to manage such things. | |||
// Default to zero, but still allow it to be set. | |||
if strconntimeout, ok := params["connection timeout"]; ok { | |||
timeout, err := strconv.ParseUint(strconntimeout, 10, 64) | |||
if err != nil { | |||
f := "Invalid connection timeout '%v': %v" | |||
return p, fmt.Errorf(f, strconntimeout, err.Error()) | |||
} | |||
p.conn_timeout = time.Duration(timeout) * time.Second | |||
} | |||
p.dial_timeout = 15 * time.Second | |||
if strdialtimeout, ok := params["dial timeout"]; ok { | |||
timeout, err := strconv.ParseUint(strdialtimeout, 10, 64) | |||
if err != nil { | |||
f := "Invalid dial timeout '%v': %v" | |||
return p, fmt.Errorf(f, strdialtimeout, err.Error()) | |||
} | |||
p.dial_timeout = time.Duration(timeout) * time.Second | |||
} | |||
// default keep alive should be 30 seconds according to spec: | |||
// https://msdn.microsoft.com/en-us/library/dd341108.aspx | |||
p.keepAlive = 30 * time.Second | |||
if keepAlive, ok := params["keepalive"]; ok { | |||
timeout, err := strconv.ParseUint(keepAlive, 10, 64) | |||
if err != nil { | |||
f := "Invalid keepAlive value '%s': %s" | |||
return p, fmt.Errorf(f, keepAlive, err.Error()) | |||
} | |||
p.keepAlive = time.Duration(timeout) * time.Second | |||
} | |||
encrypt, ok := params["encrypt"] | |||
if ok { | |||
if strings.EqualFold(encrypt, "DISABLE") { | |||
p.disableEncryption = true | |||
} else { | |||
var err error | |||
p.encrypt, err = strconv.ParseBool(encrypt) | |||
if err != nil { | |||
f := "Invalid encrypt '%s': %s" | |||
return p, fmt.Errorf(f, encrypt, err.Error()) | |||
} | |||
} | |||
} else { | |||
p.trustServerCertificate = true | |||
} | |||
trust, ok := params["trustservercertificate"] | |||
if ok { | |||
var err error | |||
p.trustServerCertificate, err = strconv.ParseBool(trust) | |||
if err != nil { | |||
f := "Invalid trust server certificate '%s': %s" | |||
return p, fmt.Errorf(f, trust, err.Error()) | |||
} | |||
} | |||
p.certificate = params["certificate"] | |||
p.hostInCertificate, ok = params["hostnameincertificate"] | |||
if ok { | |||
p.hostInCertificateProvided = true | |||
} else { | |||
p.hostInCertificate = p.host | |||
p.hostInCertificateProvided = false | |||
} | |||
serverSPN, ok := params["serverspn"] | |||
if ok { | |||
p.serverSPN = serverSPN | |||
} else { | |||
p.serverSPN = fmt.Sprintf("MSSQLSvc/%s:%d", p.host, p.port) | |||
} | |||
workstation, ok := params["workstation id"] | |||
if ok { | |||
p.workstation = workstation | |||
} else { | |||
workstation, err := os.Hostname() | |||
if err == nil { | |||
p.workstation = workstation | |||
} | |||
} | |||
appname, ok := params["app name"] | |||
if !ok { | |||
appname = "go-mssqldb" | |||
} | |||
p.appname = appname | |||
appintent, ok := params["applicationintent"] | |||
if ok { | |||
if appintent == "ReadOnly" { | |||
p.typeFlags |= fReadOnlyIntent | |||
} | |||
} | |||
failOverPartner, ok := params["failoverpartner"] | |||
if ok { | |||
p.failOverPartner = failOverPartner | |||
} | |||
failOverPort, ok := params["failoverport"] | |||
if ok { | |||
var err error | |||
p.failOverPort, err = strconv.ParseUint(failOverPort, 0, 16) | |||
if err != nil { | |||
f := "Invalid tcp port '%v': %v" | |||
return p, fmt.Errorf(f, failOverPort, err.Error()) | |||
} | |||
} | |||
return p, nil | |||
} | |||
func splitConnectionString(dsn string) (res map[string]string) { | |||
res = map[string]string{} | |||
parts := strings.Split(dsn, ";") | |||
for _, part := range parts { | |||
if len(part) == 0 { | |||
continue | |||
} | |||
lst := strings.SplitN(part, "=", 2) | |||
name := strings.TrimSpace(strings.ToLower(lst[0])) | |||
if len(name) == 0 { | |||
continue | |||
} | |||
var value string = "" | |||
if len(lst) > 1 { | |||
value = strings.TrimSpace(lst[1]) | |||
} | |||
res[name] = value | |||
} | |||
return res | |||
} | |||
// Splits a URL of the form sqlserver://username:password@host/instance?param1=value¶m2=value | |||
func splitConnectionStringURL(dsn string) (map[string]string, error) { | |||
res := map[string]string{} | |||
u, err := url.Parse(dsn) | |||
if err != nil { | |||
return res, err | |||
} | |||
if u.Scheme != "sqlserver" { | |||
return res, fmt.Errorf("scheme %s is not recognized", u.Scheme) | |||
} | |||
if u.User != nil { | |||
res["user id"] = u.User.Username() | |||
p, exists := u.User.Password() | |||
if exists { | |||
res["password"] = p | |||
} | |||
} | |||
host, port, err := net.SplitHostPort(u.Host) | |||
if err != nil { | |||
host = u.Host | |||
} | |||
if len(u.Path) > 0 { | |||
res["server"] = host + "\\" + u.Path[1:] | |||
} else { | |||
res["server"] = host | |||
} | |||
if len(port) > 0 { | |||
res["port"] = port | |||
} | |||
query := u.Query() | |||
for k, v := range query { | |||
if len(v) > 1 { | |||
return res, fmt.Errorf("key %s provided more than once", k) | |||
} | |||
res[strings.ToLower(k)] = v[0] | |||
} | |||
return res, nil | |||
} | |||
// Splits a URL in the ODBC format | |||
func splitConnectionStringOdbc(dsn string) (map[string]string, error) { | |||
res := map[string]string{} | |||
type parserState int | |||
const ( | |||
// Before the start of a key | |||
parserStateBeforeKey parserState = iota | |||
// Inside a key | |||
parserStateKey | |||
// Beginning of a value. May be bare or braced | |||
parserStateBeginValue | |||
// Inside a bare value | |||
parserStateBareValue | |||
// Inside a braced value | |||
parserStateBracedValue | |||
// A closing brace inside a braced value. | |||
// May be the end of the value or an escaped closing brace, depending on the next character | |||
parserStateBracedValueClosingBrace | |||
// After a value. Next character should be a semicolon or whitespace. | |||
parserStateEndValue | |||
) | |||
var state = parserStateBeforeKey | |||
var key string | |||
var value string | |||
for i, c := range dsn { | |||
switch state { | |||
case parserStateBeforeKey: | |||
switch { | |||
case c == '=': | |||
return res, fmt.Errorf("Unexpected character = at index %d. Expected start of key or semi-colon or whitespace.", i) | |||
case !unicode.IsSpace(c) && c != ';': | |||
state = parserStateKey | |||
key += string(c) | |||
} | |||
case parserStateKey: | |||
switch c { | |||
case '=': | |||
key = normalizeOdbcKey(key) | |||
state = parserStateBeginValue | |||
case ';': | |||
// Key without value | |||
key = normalizeOdbcKey(key) | |||
res[key] = value | |||
key = "" | |||
value = "" | |||
state = parserStateBeforeKey | |||
default: | |||
key += string(c) | |||
} | |||
case parserStateBeginValue: | |||
switch { | |||
case c == '{': | |||
state = parserStateBracedValue | |||
case c == ';': | |||
// Empty value | |||
res[key] = value | |||
key = "" | |||
state = parserStateBeforeKey | |||
case unicode.IsSpace(c): | |||
// Ignore whitespace | |||
default: | |||
state = parserStateBareValue | |||
value += string(c) | |||
} | |||
case parserStateBareValue: | |||
if c == ';' { | |||
res[key] = strings.TrimRightFunc(value, unicode.IsSpace) | |||
key = "" | |||
value = "" | |||
state = parserStateBeforeKey | |||
} else { | |||
value += string(c) | |||
} | |||
case parserStateBracedValue: | |||
if c == '}' { | |||
state = parserStateBracedValueClosingBrace | |||
} else { | |||
value += string(c) | |||
} | |||
case parserStateBracedValueClosingBrace: | |||
if c == '}' { | |||
// Escaped closing brace | |||
value += string(c) | |||
state = parserStateBracedValue | |||
continue | |||
} | |||
// End of braced value | |||
res[key] = value | |||
key = "" | |||
value = "" | |||
// This character is the first character past the end, | |||
// so it needs to be parsed like the parserStateEndValue state. | |||
state = parserStateEndValue | |||
switch { | |||
case c == ';': | |||
state = parserStateBeforeKey | |||
case unicode.IsSpace(c): | |||
// Ignore whitespace | |||
default: | |||
return res, fmt.Errorf("Unexpected character %c at index %d. Expected semi-colon or whitespace.", c, i) | |||
} | |||
case parserStateEndValue: | |||
switch { | |||
case c == ';': | |||
state = parserStateBeforeKey | |||
case unicode.IsSpace(c): | |||
// Ignore whitespace | |||
default: | |||
return res, fmt.Errorf("Unexpected character %c at index %d. Expected semi-colon or whitespace.", c, i) | |||
} | |||
} | |||
} | |||
switch state { | |||
case parserStateBeforeKey: // Okay | |||
case parserStateKey: // Unfinished key. Treat as key without value. | |||
key = normalizeOdbcKey(key) | |||
res[key] = value | |||
case parserStateBeginValue: // Empty value | |||
res[key] = value | |||
case parserStateBareValue: | |||
res[key] = strings.TrimRightFunc(value, unicode.IsSpace) | |||
case parserStateBracedValue: | |||
return res, fmt.Errorf("Unexpected end of braced value at index %d.", len(dsn)) | |||
case parserStateBracedValueClosingBrace: // End of braced value | |||
res[key] = value | |||
case parserStateEndValue: // Okay | |||
} | |||
return res, nil | |||
} | |||
// Normalizes the given string as an ODBC-format key | |||
func normalizeOdbcKey(s string) string { | |||
return strings.ToLower(strings.TrimRightFunc(s, unicode.IsSpace)) | |||
} |
@@ -1,131 +0,0 @@ | |||
package mssql | |||
import ( | |||
"encoding/binary" | |||
"errors" | |||
"math" | |||
"math/big" | |||
) | |||
// http://msdn.microsoft.com/en-us/library/ee780893.aspx | |||
type Decimal struct { | |||
integer [4]uint32 | |||
positive bool | |||
prec uint8 | |||
scale uint8 | |||
} | |||
var scaletblflt64 [39]float64 | |||
func (d Decimal) ToFloat64() float64 { | |||
val := float64(0) | |||
for i := 3; i >= 0; i-- { | |||
val *= 0x100000000 | |||
val += float64(d.integer[i]) | |||
} | |||
if !d.positive { | |||
val = -val | |||
} | |||
if d.scale != 0 { | |||
val /= scaletblflt64[d.scale] | |||
} | |||
return val | |||
} | |||
const autoScale = 100 | |||
func Float64ToDecimal(f float64) (Decimal, error) { | |||
return Float64ToDecimalScale(f, autoScale) | |||
} | |||
func Float64ToDecimalScale(f float64, scale uint8) (Decimal, error) { | |||
var dec Decimal | |||
if math.IsNaN(f) { | |||
return dec, errors.New("NaN") | |||
} | |||
if math.IsInf(f, 0) { | |||
return dec, errors.New("Infinity can't be converted to decimal") | |||
} | |||
dec.positive = f >= 0 | |||
if !dec.positive { | |||
f = math.Abs(f) | |||
} | |||
if f > 3.402823669209385e+38 { | |||
return dec, errors.New("Float value is out of range") | |||
} | |||
dec.prec = 20 | |||
var integer float64 | |||
for dec.scale = 0; dec.scale <= scale; dec.scale++ { | |||
integer = f * scaletblflt64[dec.scale] | |||
_, frac := math.Modf(integer) | |||
if frac == 0 && scale == autoScale { | |||
break | |||
} | |||
} | |||
for i := 0; i < 4; i++ { | |||
mod := math.Mod(integer, 0x100000000) | |||
integer -= mod | |||
integer /= 0x100000000 | |||
dec.integer[i] = uint32(mod) | |||
} | |||
return dec, nil | |||
} | |||
func init() { | |||
var acc float64 = 1 | |||
for i := 0; i <= 38; i++ { | |||
scaletblflt64[i] = acc | |||
acc *= 10 | |||
} | |||
} | |||
func (d Decimal) BigInt() big.Int { | |||
bytes := make([]byte, 16) | |||
binary.BigEndian.PutUint32(bytes[0:4], d.integer[3]) | |||
binary.BigEndian.PutUint32(bytes[4:8], d.integer[2]) | |||
binary.BigEndian.PutUint32(bytes[8:12], d.integer[1]) | |||
binary.BigEndian.PutUint32(bytes[12:16], d.integer[0]) | |||
var x big.Int | |||
x.SetBytes(bytes) | |||
if !d.positive { | |||
x.Neg(&x) | |||
} | |||
return x | |||
} | |||
func (d Decimal) Bytes() []byte { | |||
x := d.BigInt() | |||
return scaleBytes(x.String(), d.scale) | |||
} | |||
func (d Decimal) UnscaledBytes() []byte { | |||
x := d.BigInt() | |||
return x.Bytes() | |||
} | |||
func scaleBytes(s string, scale uint8) []byte { | |||
z := make([]byte, 0, len(s)+1) | |||
if s[0] == '-' || s[0] == '+' { | |||
z = append(z, byte(s[0])) | |||
s = s[1:] | |||
} | |||
pos := len(s) - int(scale) | |||
if pos <= 0 { | |||
z = append(z, byte('0')) | |||
} else if pos > 0 { | |||
z = append(z, []byte(s[:pos])...) | |||
} | |||
if scale > 0 { | |||
z = append(z, byte('.')) | |||
for pos < 0 { | |||
z = append(z, byte('0')) | |||
pos++ | |||
} | |||
z = append(z, []byte(s[pos:])...) | |||
} | |||
return z | |||
} | |||
func (d Decimal) String() string { | |||
return string(d.Bytes()) | |||
} |
@@ -3,8 +3,6 @@ module github.com/denisenkom/go-mssqldb | |||
go 1.11 | |||
require ( | |||
cloud.google.com/go v0.37.4 | |||
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe | |||
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c | |||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect | |||
gopkg.in/yaml.v2 v2.2.2 // indirect | |||
) |
@@ -1,168 +1,5 @@ | |||
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= | |||
cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= | |||
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= | |||
cloud.google.com/go v0.37.2 h1:4y4L7BdHenTfZL0HervofNTHh9Ad6mNX72cQvl+5eH0= | |||
cloud.google.com/go v0.37.2/go.mod h1:H8IAquKe2L30IxoupDgqTaQvKSwF/c8prYHynGIWQbA= | |||
git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= | |||
git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= | |||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= | |||
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= | |||
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= | |||
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= | |||
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= | |||
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= | |||
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= | |||
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= | |||
github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= | |||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= | |||
github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= | |||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | |||
github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= | |||
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= | |||
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= | |||
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= | |||
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= | |||
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= | |||
github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= | |||
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= | |||
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= | |||
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= | |||
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= | |||
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= | |||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= | |||
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= | |||
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= | |||
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= | |||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= | |||
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= | |||
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= | |||
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= | |||
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= | |||
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= | |||
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= | |||
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= | |||
github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= | |||
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= | |||
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= | |||
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= | |||
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= | |||
github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= | |||
github.com/grpc-ecosystem/grpc-gateway v1.6.2/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= | |||
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= | |||
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= | |||
github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= | |||
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= | |||
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= | |||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= | |||
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= | |||
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= | |||
github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= | |||
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= | |||
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= | |||
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= | |||
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= | |||
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= | |||
github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= | |||
github.com/openzipkin/zipkin-go v0.1.3/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= | |||
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= | |||
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= | |||
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= | |||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= | |||
github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= | |||
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= | |||
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= | |||
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= | |||
github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= | |||
github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= | |||
github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= | |||
github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= | |||
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= | |||
github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= | |||
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= | |||
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= | |||
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= | |||
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= | |||
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= | |||
go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= | |||
go.opencensus.io v0.19.1/go.mod h1:gug0GbSHa8Pafr0d2urOSgoXHZ6x/RUlaiT0d9pqb4A= | |||
go.opencensus.io v0.19.2/go.mod h1:NO/8qkisMZLZ1FCsKNqtJPwc8/TaclWyY0B6wcYNg9M= | |||
go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= | |||
golang.org/x/build v0.0.0-20190314133821-5284462c4bec/go.mod h1:atTaCNAy0f16Ah5aV1gMSwgiKVHwu/JncqDpuRr7lS4= | |||
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= | |||
golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= | |||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | |||
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= | |||
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= | |||
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c h1:Vj5n4GlwjmQteupaxJ9+0FNOmBrHfq7vN4btdGoDZgI= | |||
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | |||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= | |||
golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= | |||
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= | |||
golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= | |||
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= | |||
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= | |||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |||
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |||
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |||
golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |||
golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |||
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |||
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |||
golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |||
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |||
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | |||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= | |||
golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= | |||
golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= | |||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= | |||
golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= | |||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | |||
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | |||
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | |||
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | |||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | |||
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | |||
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | |||
golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | |||
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | |||
golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | |||
golang.org/x/sys v0.0.0-20181218192612-074acd46bca6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | |||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | |||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | |||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | |||
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= | |||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= | |||
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | |||
golang.org/x/tools v0.0.0-20181219222714-6e267b5cc78e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | |||
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | |||
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= | |||
golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= | |||
google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= | |||
google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= | |||
google.golang.org/api v0.0.0-20181220000619-583d854617af/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= | |||
google.golang.org/api v0.2.0/go.mod h1:IfRCZScioGtypHNTlz3gFk67J8uePVW7uDTBzXuIkhU= | |||
google.golang.org/api v0.3.0/go.mod h1:IuvZyQh8jgscv8qWfQ4ABd8m7hEudgBFM/EdhA3BnXw= | |||
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= | |||
google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= | |||
google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= | |||
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= | |||
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= | |||
google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= | |||
google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= | |||
google.golang.org/genproto v0.0.0-20181219182458-5a97ab628bfb/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= | |||
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= | |||
google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= | |||
google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= | |||
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= | |||
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= | |||
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= | |||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | |||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | |||
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= | |||
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= | |||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= | |||
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | |||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | |||
grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= | |||
honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= | |||
honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= | |||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= | |||
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= |
@@ -0,0 +1,252 @@ | |||
package decimal | |||
import ( | |||
"encoding/binary" | |||
"errors" | |||
"fmt" | |||
"math" | |||
"math/big" | |||
"strings" | |||
) | |||
// Decimal represents decimal type in the Microsoft Open Specifications: http://msdn.microsoft.com/en-us/library/ee780893.aspx | |||
type Decimal struct { | |||
integer [4]uint32 // Little-endian | |||
positive bool | |||
prec uint8 | |||
scale uint8 | |||
} | |||
var ( | |||
scaletblflt64 [39]float64 | |||
int10 big.Int | |||
int1e5 big.Int | |||
) | |||
func init() { | |||
var acc float64 = 1 | |||
for i := 0; i <= 38; i++ { | |||
scaletblflt64[i] = acc | |||
acc *= 10 | |||
} | |||
int10.SetInt64(10) | |||
int1e5.SetInt64(1e5) | |||
} | |||
const autoScale = 100 | |||
// SetInteger sets the ind'th element in the integer array | |||
func (d *Decimal) SetInteger(integer uint32, ind uint8) { | |||
d.integer[ind] = integer | |||
} | |||
// SetPositive sets the positive member | |||
func (d *Decimal) SetPositive(positive bool) { | |||
d.positive = positive | |||
} | |||
// SetPrec sets the prec member | |||
func (d *Decimal) SetPrec(prec uint8) { | |||
d.prec = prec | |||
} | |||
// SetScale sets the scale member | |||
func (d *Decimal) SetScale(scale uint8) { | |||
d.scale = scale | |||
} | |||
// IsPositive returns true if the Decimal is positive | |||
func (d *Decimal) IsPositive() bool { | |||
return d.positive | |||
} | |||
// ToFloat64 converts decimal to a float64 | |||
func (d Decimal) ToFloat64() float64 { | |||
val := float64(0) | |||
for i := 3; i >= 0; i-- { | |||
val *= 0x100000000 | |||
val += float64(d.integer[i]) | |||
} | |||
if !d.positive { | |||
val = -val | |||
} | |||
if d.scale != 0 { | |||
val /= scaletblflt64[d.scale] | |||
} | |||
return val | |||
} | |||
// BigInt converts decimal to a bigint | |||
func (d Decimal) BigInt() big.Int { | |||
bytes := make([]byte, 16) | |||
binary.BigEndian.PutUint32(bytes[0:4], d.integer[3]) | |||
binary.BigEndian.PutUint32(bytes[4:8], d.integer[2]) | |||
binary.BigEndian.PutUint32(bytes[8:12], d.integer[1]) | |||
binary.BigEndian.PutUint32(bytes[12:16], d.integer[0]) | |||
var x big.Int | |||
x.SetBytes(bytes) | |||
if !d.positive { | |||
x.Neg(&x) | |||
} | |||
return x | |||
} | |||
// Bytes converts decimal to a scaled byte slice | |||
func (d Decimal) Bytes() []byte { | |||
x := d.BigInt() | |||
return ScaleBytes(x.String(), d.scale) | |||
} | |||
// UnscaledBytes converts decimal to a unscaled byte slice | |||
func (d Decimal) UnscaledBytes() []byte { | |||
x := d.BigInt() | |||
return x.Bytes() | |||
} | |||
// String converts decimal to a string | |||
func (d Decimal) String() string { | |||
return string(d.Bytes()) | |||
} | |||
// Float64ToDecimal converts float64 to decimal | |||
func Float64ToDecimal(f float64) (Decimal, error) { | |||
return Float64ToDecimalScale(f, autoScale) | |||
} | |||
// Float64ToDecimalScale converts float64 to decimal; user can specify the scale | |||
func Float64ToDecimalScale(f float64, scale uint8) (Decimal, error) { | |||
var dec Decimal | |||
if math.IsNaN(f) { | |||
return dec, errors.New("NaN") | |||
} | |||
if math.IsInf(f, 0) { | |||
return dec, errors.New("Infinity can't be converted to decimal") | |||
} | |||
dec.positive = f >= 0 | |||
if !dec.positive { | |||
f = math.Abs(f) | |||
} | |||
if f > 3.402823669209385e+38 { | |||
return dec, errors.New("Float value is out of range") | |||
} | |||
dec.prec = 20 | |||
var integer float64 | |||
for dec.scale = 0; dec.scale <= scale; dec.scale++ { | |||
integer = f * scaletblflt64[dec.scale] | |||
_, frac := math.Modf(integer) | |||
if frac == 0 && scale == autoScale { | |||
break | |||
} | |||
} | |||
for i := 0; i < 4; i++ { | |||
mod := math.Mod(integer, 0x100000000) | |||
integer -= mod | |||
integer /= 0x100000000 | |||
dec.integer[i] = uint32(mod) | |||
if mod-math.Trunc(mod) >= 0.5 { | |||
dec.integer[i] = uint32(mod) + 1 | |||
} | |||
} | |||
return dec, nil | |||
} | |||
// Int64ToDecimalScale converts float64 to decimal; user can specify the scale | |||
func Int64ToDecimalScale(v int64, scale uint8) Decimal { | |||
positive := v >= 0 | |||
if !positive { | |||
if v == math.MinInt64 { | |||
// Special case - can't negate | |||
return Decimal{ | |||
integer: [4]uint32{0, 0x80000000, 0, 0}, | |||
positive: false, | |||
prec: 20, | |||
scale: 0, | |||
} | |||
} | |||
v = -v | |||
} | |||
return Decimal{ | |||
integer: [4]uint32{uint32(v), uint32(v >> 32), 0, 0}, | |||
positive: positive, | |||
prec: 20, | |||
scale: scale, | |||
} | |||
} | |||
// StringToDecimalScale converts string to decimal | |||
func StringToDecimalScale(v string, outScale uint8) (Decimal, error) { | |||
var r big.Int | |||
var unscaled string | |||
var inScale int | |||
point := strings.LastIndexByte(v, '.') | |||
if point == -1 { | |||
inScale = 0 | |||
unscaled = v | |||
} else { | |||
inScale = len(v) - point - 1 | |||
unscaled = v[:point] + v[point+1:] | |||
} | |||
if inScale > math.MaxUint8 { | |||
return Decimal{}, fmt.Errorf("can't parse %q as a decimal number: scale too large", v) | |||
} | |||
_, ok := r.SetString(unscaled, 10) | |||
if !ok { | |||
return Decimal{}, fmt.Errorf("can't parse %q as a decimal number", v) | |||
} | |||
if inScale > int(outScale) { | |||
return Decimal{}, fmt.Errorf("can't parse %q as a decimal number: scale %d is larger than the scale %d of the target column", v, inScale, outScale) | |||
} | |||
for inScale < int(outScale) { | |||
if int(outScale)-inScale >= 5 { | |||
r.Mul(&r, &int1e5) | |||
inScale += 5 | |||
} else { | |||
r.Mul(&r, &int10) | |||
inScale++ | |||
} | |||
} | |||
bytes := r.Bytes() | |||
if len(bytes) > 16 { | |||
return Decimal{}, fmt.Errorf("can't parse %q as a decimal number: precision too large", v) | |||
} | |||
var out [4]uint32 | |||
for i, b := range bytes { | |||
pos := len(bytes) - i - 1 | |||
out[pos/4] += uint32(b) << uint(pos%4*8) | |||
} | |||
return Decimal{ | |||
integer: out, | |||
positive: r.Sign() >= 0, | |||
prec: 20, | |||
scale: uint8(inScale), | |||
}, nil | |||
} | |||
// ScaleBytes converts a stringified decimal to a scaled byte slice | |||
func ScaleBytes(s string, scale uint8) []byte { | |||
z := make([]byte, 0, len(s)+1) | |||
if s[0] == '-' || s[0] == '+' { | |||
z = append(z, byte(s[0])) | |||
s = s[1:] | |||
} | |||
pos := len(s) - int(scale) | |||
if pos <= 0 { | |||
z = append(z, byte('0')) | |||
} else if pos > 0 { | |||
z = append(z, []byte(s[:pos])...) | |||
} | |||
if scale > 0 { | |||
z = append(z, byte('.')) | |||
for pos < 0 { | |||
z = append(z, byte('0')) | |||
pos++ | |||
} | |||
z = append(z, []byte(s[pos:])...) | |||
} | |||
return z | |||
} |
@@ -11,7 +11,7 @@ import ( | |||
"time" | |||
// "github.com/cockroachdb/apd" | |||
"cloud.google.com/go/civil" | |||
"github.com/golang-sql/civil" | |||
) | |||
// Type alias provided for compatibility. |
@@ -9,9 +9,6 @@ import ( | |||
type timeoutConn struct { | |||
c net.Conn | |||
timeout time.Duration | |||
buf *tdsBuffer | |||
packetPending bool | |||
continueRead bool | |||
} | |||
func newTimeoutConn(conn net.Conn, timeout time.Duration) *timeoutConn { | |||
@@ -22,32 +19,6 @@ func newTimeoutConn(conn net.Conn, timeout time.Duration) *timeoutConn { | |||
} | |||
func (c *timeoutConn) Read(b []byte) (n int, err error) { | |||
if c.buf != nil { | |||
if c.packetPending { | |||
c.packetPending = false | |||
err = c.buf.FinishPacket() | |||
if err != nil { | |||
err = fmt.Errorf("Cannot send handshake packet: %s", err.Error()) | |||
return | |||
} | |||
c.continueRead = false | |||
} | |||
if !c.continueRead { | |||
var packet packetType | |||
packet, err = c.buf.BeginRead() | |||
if err != nil { | |||
err = fmt.Errorf("Cannot read handshake packet: %s", err.Error()) | |||
return | |||
} | |||
if packet != packPrelogin { | |||
err = fmt.Errorf("unexpected packet %d, expecting prelogin", packet) | |||
return | |||
} | |||
c.continueRead = true | |||
} | |||
n, err = c.buf.Read(b) | |||
return | |||
} | |||
if c.timeout > 0 { | |||
err = c.c.SetDeadline(time.Now().Add(c.timeout)) | |||
if err != nil { | |||
@@ -58,17 +29,6 @@ func (c *timeoutConn) Read(b []byte) (n int, err error) { | |||
} | |||
func (c *timeoutConn) Write(b []byte) (n int, err error) { | |||
if c.buf != nil { | |||
if !c.packetPending { | |||
c.buf.BeginPacket(packPrelogin, false) | |||
c.packetPending = true | |||
} | |||
n, err = c.buf.Write(b) | |||
if err != nil { | |||
return | |||
} | |||
return | |||
} | |||
if c.timeout > 0 { | |||
err = c.c.SetDeadline(time.Now().Add(c.timeout)) | |||
if err != nil { | |||
@@ -101,3 +61,108 @@ func (c timeoutConn) SetReadDeadline(t time.Time) error { | |||
func (c timeoutConn) SetWriteDeadline(t time.Time) error { | |||
panic("Not implemented") | |||
} | |||
// this connection is used during TLS Handshake | |||
// TDS protocol requires TLS handshake messages to be sent inside TDS packets | |||
type tlsHandshakeConn struct { | |||
buf *tdsBuffer | |||
packetPending bool | |||
continueRead bool | |||
} | |||
func (c *tlsHandshakeConn) Read(b []byte) (n int, err error) { | |||
if c.packetPending { | |||
c.packetPending = false | |||
err = c.buf.FinishPacket() | |||
if err != nil { | |||
err = fmt.Errorf("Cannot send handshake packet: %s", err.Error()) | |||
return | |||
} | |||
c.continueRead = false | |||
} | |||
if !c.continueRead { | |||
var packet packetType | |||
packet, err = c.buf.BeginRead() | |||
if err != nil { | |||
err = fmt.Errorf("Cannot read handshake packet: %s", err.Error()) | |||
return | |||
} | |||
if packet != packPrelogin { | |||
err = fmt.Errorf("unexpected packet %d, expecting prelogin", packet) | |||
return | |||
} | |||
c.continueRead = true | |||
} | |||
return c.buf.Read(b) | |||
} | |||
func (c *tlsHandshakeConn) Write(b []byte) (n int, err error) { | |||
if !c.packetPending { | |||
c.buf.BeginPacket(packPrelogin, false) | |||
c.packetPending = true | |||
} | |||
return c.buf.Write(b) | |||
} | |||
func (c *tlsHandshakeConn) Close() error { | |||
panic("Not implemented") | |||
} | |||
func (c *tlsHandshakeConn) LocalAddr() net.Addr { | |||
panic("Not implemented") | |||
} | |||
func (c *tlsHandshakeConn) RemoteAddr() net.Addr { | |||
panic("Not implemented") | |||
} | |||
func (c *tlsHandshakeConn) SetDeadline(t time.Time) error { | |||
panic("Not implemented") | |||
} | |||
func (c *tlsHandshakeConn) SetReadDeadline(t time.Time) error { | |||
panic("Not implemented") | |||
} | |||
func (c *tlsHandshakeConn) SetWriteDeadline(t time.Time) error { | |||
panic("Not implemented") | |||
} | |||
// this connection just delegates all methods to it's wrapped connection | |||
// it also allows switching underlying connection on the fly | |||
// it is needed because tls.Conn does not allow switching underlying connection | |||
type passthroughConn struct { | |||
c net.Conn | |||
} | |||
func (c passthroughConn) Read(b []byte) (n int, err error) { | |||
return c.c.Read(b) | |||
} | |||
func (c passthroughConn) Write(b []byte) (n int, err error) { | |||
return c.c.Write(b) | |||
} | |||
func (c passthroughConn) Close() error { | |||
return c.c.Close() | |||
} | |||
func (c passthroughConn) LocalAddr() net.Addr { | |||
panic("Not implemented") | |||
} | |||
func (c passthroughConn) RemoteAddr() net.Addr { | |||
panic("Not implemented") | |||
} | |||
func (c passthroughConn) SetDeadline(t time.Time) error { | |||
panic("Not implemented") | |||
} | |||
func (c passthroughConn) SetReadDeadline(t time.Time) error { | |||
panic("Not implemented") | |||
} | |||
func (c passthroughConn) SetWriteDeadline(t time.Time) error { | |||
panic("Not implemented") | |||
} |
@@ -10,13 +10,9 @@ import ( | |||
"io" | |||
"io/ioutil" | |||
"net" | |||
"net/url" | |||
"os" | |||
"sort" | |||
"strconv" | |||
"strings" | |||
"time" | |||
"unicode" | |||
"unicode/utf16" | |||
"unicode/utf8" | |||
) | |||
@@ -51,15 +47,13 @@ func parseInstances(msg []byte) map[string]map[string]string { | |||
} | |||
func getInstances(ctx context.Context, d Dialer, address string) (map[string]map[string]string, error) { | |||
maxTime := 5 * time.Second | |||
ctx, cancel := context.WithTimeout(ctx, maxTime) | |||
defer cancel() | |||
conn, err := d.DialContext(ctx, "udp", address+":1434") | |||
if err != nil { | |||
return nil, err | |||
} | |||
defer conn.Close() | |||
conn.SetDeadline(time.Now().Add(maxTime)) | |||
deadline, _ := ctx.Deadline() | |||
conn.SetDeadline(deadline) | |||
_, err = conn.Write([]byte{3}) | |||
if err != nil { | |||
return nil, err | |||
@@ -474,10 +468,9 @@ func readUcs2(r io.Reader, numchars int) (res string, err error) { | |||
} | |||
func readUsVarChar(r io.Reader) (res string, err error) { | |||
var numchars uint16 | |||
err = binary.Read(r, binary.LittleEndian, &numchars) | |||
numchars, err := readUshort(r) | |||
if err != nil { | |||
return "", err | |||
return | |||
} | |||
return readUcs2(r, int(numchars)) | |||
} | |||
@@ -497,8 +490,7 @@ func writeUsVarChar(w io.Writer, s string) (err error) { | |||
} | |||
func readBVarChar(r io.Reader) (res string, err error) { | |||
var numchars uint8 | |||
err = binary.Read(r, binary.LittleEndian, &numchars) | |||
numchars, err := readByte(r) | |||
if err != nil { | |||
return "", err | |||
} | |||
@@ -525,8 +517,7 @@ func writeBVarChar(w io.Writer, s string) (err error) { | |||
} | |||
func readBVarByte(r io.Reader) (res []byte, err error) { | |||
var length uint8 | |||
err = binary.Read(r, binary.LittleEndian, &length) | |||
length, err := readByte(r) | |||
if err != nil { | |||
return | |||
} | |||
@@ -654,458 +645,6 @@ func sendAttention(buf *tdsBuffer) error { | |||
return buf.FinishPacket() | |||
} | |||
type connectParams struct { | |||
logFlags uint64 | |||
port uint64 | |||
host string | |||
instance string | |||
database string | |||
user string | |||
password string | |||
dial_timeout time.Duration | |||
conn_timeout time.Duration | |||
keepAlive time.Duration | |||
encrypt bool | |||
disableEncryption bool | |||
trustServerCertificate bool | |||
certificate string | |||
hostInCertificate string | |||
hostInCertificateProvided bool | |||
serverSPN string | |||
workstation string | |||
appname string | |||
typeFlags uint8 | |||
failOverPartner string | |||
failOverPort uint64 | |||
packetSize uint16 | |||
} | |||
func splitConnectionString(dsn string) (res map[string]string) { | |||
res = map[string]string{} | |||
parts := strings.Split(dsn, ";") | |||
for _, part := range parts { | |||
if len(part) == 0 { | |||
continue | |||
} | |||
lst := strings.SplitN(part, "=", 2) | |||
name := strings.TrimSpace(strings.ToLower(lst[0])) | |||
if len(name) == 0 { | |||
continue | |||
} | |||
var value string = "" | |||
if len(lst) > 1 { | |||
value = strings.TrimSpace(lst[1]) | |||
} | |||
res[name] = value | |||
} | |||
return res | |||
} | |||
// Splits a URL in the ODBC format | |||
func splitConnectionStringOdbc(dsn string) (map[string]string, error) { | |||
res := map[string]string{} | |||
type parserState int | |||
const ( | |||
// Before the start of a key | |||
parserStateBeforeKey parserState = iota | |||
// Inside a key | |||
parserStateKey | |||
// Beginning of a value. May be bare or braced | |||
parserStateBeginValue | |||
// Inside a bare value | |||
parserStateBareValue | |||
// Inside a braced value | |||
parserStateBracedValue | |||
// A closing brace inside a braced value. | |||
// May be the end of the value or an escaped closing brace, depending on the next character | |||
parserStateBracedValueClosingBrace | |||
// After a value. Next character should be a semicolon or whitespace. | |||
parserStateEndValue | |||
) | |||
var state = parserStateBeforeKey | |||
var key string | |||
var value string | |||
for i, c := range dsn { | |||
switch state { | |||
case parserStateBeforeKey: | |||
switch { | |||
case c == '=': | |||
return res, fmt.Errorf("Unexpected character = at index %d. Expected start of key or semi-colon or whitespace.", i) | |||
case !unicode.IsSpace(c) && c != ';': | |||
state = parserStateKey | |||
key += string(c) | |||
} | |||
case parserStateKey: | |||
switch c { | |||
case '=': | |||
key = normalizeOdbcKey(key) | |||
if len(key) == 0 { | |||
return res, fmt.Errorf("Unexpected end of key at index %d.", i) | |||
} | |||
state = parserStateBeginValue | |||
case ';': | |||
// Key without value | |||
key = normalizeOdbcKey(key) | |||
if len(key) == 0 { | |||
return res, fmt.Errorf("Unexpected end of key at index %d.", i) | |||
} | |||
res[key] = value | |||
key = "" | |||
value = "" | |||
state = parserStateBeforeKey | |||
default: | |||
key += string(c) | |||
} | |||
case parserStateBeginValue: | |||
switch { | |||
case c == '{': | |||
state = parserStateBracedValue | |||
case c == ';': | |||
// Empty value | |||
res[key] = value | |||
key = "" | |||
state = parserStateBeforeKey | |||
case unicode.IsSpace(c): | |||
// Ignore whitespace | |||
default: | |||
state = parserStateBareValue | |||
value += string(c) | |||
} | |||
case parserStateBareValue: | |||
if c == ';' { | |||
res[key] = strings.TrimRightFunc(value, unicode.IsSpace) | |||
key = "" | |||
value = "" | |||
state = parserStateBeforeKey | |||
} else { | |||
value += string(c) | |||
} | |||
case parserStateBracedValue: | |||
if c == '}' { | |||
state = parserStateBracedValueClosingBrace | |||
} else { | |||
value += string(c) | |||
} | |||
case parserStateBracedValueClosingBrace: | |||
if c == '}' { | |||
// Escaped closing brace | |||
value += string(c) | |||
state = parserStateBracedValue | |||
continue | |||
} | |||
// End of braced value | |||
res[key] = value | |||
key = "" | |||
value = "" | |||
// This character is the first character past the end, | |||
// so it needs to be parsed like the parserStateEndValue state. | |||
state = parserStateEndValue | |||
switch { | |||
case c == ';': | |||
state = parserStateBeforeKey | |||
case unicode.IsSpace(c): | |||
// Ignore whitespace | |||
default: | |||
return res, fmt.Errorf("Unexpected character %c at index %d. Expected semi-colon or whitespace.", c, i) | |||
} | |||
case parserStateEndValue: | |||
switch { | |||
case c == ';': | |||
state = parserStateBeforeKey | |||
case unicode.IsSpace(c): | |||
// Ignore whitespace | |||
default: | |||
return res, fmt.Errorf("Unexpected character %c at index %d. Expected semi-colon or whitespace.", c, i) | |||
} | |||
} | |||
} | |||
switch state { | |||
case parserStateBeforeKey: // Okay | |||
case parserStateKey: // Unfinished key. Treat as key without value. | |||
key = normalizeOdbcKey(key) | |||
if len(key) == 0 { | |||
return res, fmt.Errorf("Unexpected end of key at index %d.", len(dsn)) | |||
} | |||
res[key] = value | |||
case parserStateBeginValue: // Empty value | |||
res[key] = value | |||
case parserStateBareValue: | |||
res[key] = strings.TrimRightFunc(value, unicode.IsSpace) | |||
case parserStateBracedValue: | |||
return res, fmt.Errorf("Unexpected end of braced value at index %d.", len(dsn)) | |||
case parserStateBracedValueClosingBrace: // End of braced value | |||
res[key] = value | |||
case parserStateEndValue: // Okay | |||
} | |||
return res, nil | |||
} | |||
// Normalizes the given string as an ODBC-format key | |||
func normalizeOdbcKey(s string) string { | |||
return strings.ToLower(strings.TrimRightFunc(s, unicode.IsSpace)) | |||
} | |||
// Splits a URL of the form sqlserver://username:password@host/instance?param1=value¶m2=value | |||
func splitConnectionStringURL(dsn string) (map[string]string, error) { | |||
res := map[string]string{} | |||
u, err := url.Parse(dsn) | |||
if err != nil { | |||
return res, err | |||
} | |||
if u.Scheme != "sqlserver" { | |||
return res, fmt.Errorf("scheme %s is not recognized", u.Scheme) | |||
} | |||
if u.User != nil { | |||
res["user id"] = u.User.Username() | |||
p, exists := u.User.Password() | |||
if exists { | |||
res["password"] = p | |||
} | |||
} | |||
host, port, err := net.SplitHostPort(u.Host) | |||
if err != nil { | |||
host = u.Host | |||
} | |||
if len(u.Path) > 0 { | |||
res["server"] = host + "\\" + u.Path[1:] | |||
} else { | |||
res["server"] = host | |||
} | |||
if len(port) > 0 { | |||
res["port"] = port | |||
} | |||
query := u.Query() | |||
for k, v := range query { | |||
if len(v) > 1 { | |||
return res, fmt.Errorf("key %s provided more than once", k) | |||
} | |||
res[strings.ToLower(k)] = v[0] | |||
} | |||
return res, nil | |||
} | |||
func parseConnectParams(dsn string) (connectParams, error) { | |||
var p connectParams | |||
var params map[string]string | |||
if strings.HasPrefix(dsn, "odbc:") { | |||
parameters, err := splitConnectionStringOdbc(dsn[len("odbc:"):]) | |||
if err != nil { | |||
return p, err | |||
} | |||
params = parameters | |||
} else if strings.HasPrefix(dsn, "sqlserver://") { | |||
parameters, err := splitConnectionStringURL(dsn) | |||
if err != nil { | |||
return p, err | |||
} | |||
params = parameters | |||
} else { | |||
params = splitConnectionString(dsn) | |||
} | |||
strlog, ok := params["log"] | |||
if ok { | |||
var err error | |||
p.logFlags, err = strconv.ParseUint(strlog, 10, 64) | |||
if err != nil { | |||
return p, fmt.Errorf("Invalid log parameter '%s': %s", strlog, err.Error()) | |||
} | |||
} | |||
server := params["server"] | |||
parts := strings.SplitN(server, `\`, 2) | |||
p.host = parts[0] | |||
if p.host == "." || strings.ToUpper(p.host) == "(LOCAL)" || p.host == "" { | |||
p.host = "localhost" | |||
} | |||
if len(parts) > 1 { | |||
p.instance = parts[1] | |||
} | |||
p.database = params["database"] | |||
p.user = params["user id"] | |||
p.password = params["password"] | |||
p.port = 1433 | |||
strport, ok := params["port"] | |||
if ok { | |||
var err error | |||
p.port, err = strconv.ParseUint(strport, 10, 16) | |||
if err != nil { | |||
f := "Invalid tcp port '%v': %v" | |||
return p, fmt.Errorf(f, strport, err.Error()) | |||
} | |||
} | |||
// https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/configure-the-network-packet-size-server-configuration-option | |||
// Default packet size remains at 4096 bytes | |||
p.packetSize = 4096 | |||
strpsize, ok := params["packet size"] | |||
if ok { | |||
var err error | |||
psize, err := strconv.ParseUint(strpsize, 0, 16) | |||
if err != nil { | |||
f := "Invalid packet size '%v': %v" | |||
return p, fmt.Errorf(f, strpsize, err.Error()) | |||
} | |||
// Ensure packet size falls within the TDS protocol range of 512 to 32767 bytes | |||
// NOTE: Encrypted connections have a maximum size of 16383 bytes. If you request | |||
// a higher packet size, the server will respond with an ENVCHANGE request to | |||
// alter the packet size to 16383 bytes. | |||
p.packetSize = uint16(psize) | |||
if p.packetSize < 512 { | |||
p.packetSize = 512 | |||
} else if p.packetSize > 32767 { | |||
p.packetSize = 32767 | |||
} | |||
} | |||
// https://msdn.microsoft.com/en-us/library/dd341108.aspx | |||
// | |||
// Do not set a connection timeout. Use Context to manage such things. | |||
// Default to zero, but still allow it to be set. | |||
if strconntimeout, ok := params["connection timeout"]; ok { | |||
timeout, err := strconv.ParseUint(strconntimeout, 10, 64) | |||
if err != nil { | |||
f := "Invalid connection timeout '%v': %v" | |||
return p, fmt.Errorf(f, strconntimeout, err.Error()) | |||
} | |||
p.conn_timeout = time.Duration(timeout) * time.Second | |||
} | |||
p.dial_timeout = 15 * time.Second | |||
if strdialtimeout, ok := params["dial timeout"]; ok { | |||
timeout, err := strconv.ParseUint(strdialtimeout, 10, 64) | |||
if err != nil { | |||
f := "Invalid dial timeout '%v': %v" | |||
return p, fmt.Errorf(f, strdialtimeout, err.Error()) | |||
} | |||
p.dial_timeout = time.Duration(timeout) * time.Second | |||
} | |||
// default keep alive should be 30 seconds according to spec: | |||
// https://msdn.microsoft.com/en-us/library/dd341108.aspx | |||
p.keepAlive = 30 * time.Second | |||
if keepAlive, ok := params["keepalive"]; ok { | |||
timeout, err := strconv.ParseUint(keepAlive, 10, 64) | |||
if err != nil { | |||
f := "Invalid keepAlive value '%s': %s" | |||
return p, fmt.Errorf(f, keepAlive, err.Error()) | |||
} | |||
p.keepAlive = time.Duration(timeout) * time.Second | |||
} | |||
encrypt, ok := params["encrypt"] | |||
if ok { | |||
if strings.EqualFold(encrypt, "DISABLE") { | |||
p.disableEncryption = true | |||
} else { | |||
var err error | |||
p.encrypt, err = strconv.ParseBool(encrypt) | |||
if err != nil { | |||
f := "Invalid encrypt '%s': %s" | |||
return p, fmt.Errorf(f, encrypt, err.Error()) | |||
} | |||
} | |||
} else { | |||
p.trustServerCertificate = true | |||
} | |||
trust, ok := params["trustservercertificate"] | |||
if ok { | |||
var err error | |||
p.trustServerCertificate, err = strconv.ParseBool(trust) | |||
if err != nil { | |||
f := "Invalid trust server certificate '%s': %s" | |||
return p, fmt.Errorf(f, trust, err.Error()) | |||
} | |||
} | |||
p.certificate = params["certificate"] | |||
p.hostInCertificate, ok = params["hostnameincertificate"] | |||
if ok { | |||
p.hostInCertificateProvided = true | |||
} else { | |||
p.hostInCertificate = p.host | |||
p.hostInCertificateProvided = false | |||
} | |||
serverSPN, ok := params["serverspn"] | |||
if ok { | |||
p.serverSPN = serverSPN | |||
} else { | |||
p.serverSPN = fmt.Sprintf("MSSQLSvc/%s:%d", p.host, p.port) | |||
} | |||
workstation, ok := params["workstation id"] | |||
if ok { | |||
p.workstation = workstation | |||
} else { | |||
workstation, err := os.Hostname() | |||
if err == nil { | |||
p.workstation = workstation | |||
} | |||
} | |||
appname, ok := params["app name"] | |||
if !ok { | |||
appname = "go-mssqldb" | |||
} | |||
p.appname = appname | |||
appintent, ok := params["applicationintent"] | |||
if ok { | |||
if appintent == "ReadOnly" { | |||
p.typeFlags |= fReadOnlyIntent | |||
} | |||
} | |||
failOverPartner, ok := params["failoverpartner"] | |||
if ok { | |||
p.failOverPartner = failOverPartner | |||
} | |||
failOverPort, ok := params["failoverport"] | |||
if ok { | |||
var err error | |||
p.failOverPort, err = strconv.ParseUint(failOverPort, 0, 16) | |||
if err != nil { | |||
f := "Invalid tcp port '%v': %v" | |||
return p, fmt.Errorf(f, failOverPort, err.Error()) | |||
} | |||
} | |||
return p, nil | |||
} | |||
type auth interface { | |||
InitialBytes() ([]byte, error) | |||
NextBytes([]byte) ([]byte, error) | |||
@@ -1277,12 +816,12 @@ initiate_connection: | |||
// while SQL Server seems to expect one TCP segment per encrypted TDS package. | |||
// Setting DynamicRecordSizingDisabled to true disables that algorithm and uses 16384 bytes per TLS package | |||
config.DynamicRecordSizingDisabled = true | |||
outbuf.transport = conn | |||
toconn.buf = outbuf | |||
tlsConn := tls.Client(toconn, &config) | |||
// setting up connection handler which will allow wrapping of TLS handshake packets inside TDS stream | |||
handshakeConn := tlsHandshakeConn{buf: outbuf} | |||
passthrough := passthroughConn{c: &handshakeConn} | |||
tlsConn := tls.Client(&passthrough, &config) | |||
err = tlsConn.Handshake() | |||
toconn.buf = nil | |||
passthrough.c = toconn | |||
outbuf.transport = tlsConn | |||
if err != nil { | |||
return nil, fmt.Errorf("TLS Handshake failed: %v", err) |
@@ -11,6 +11,7 @@ import ( | |||
"time" | |||
"github.com/denisenkom/go-mssqldb/internal/cp" | |||
"github.com/denisenkom/go-mssqldb/internal/decimal" | |||
) | |||
// fixed-length data types | |||
@@ -818,12 +819,12 @@ func decodeMoney(buf []byte) []byte { | |||
uint64(buf[1])<<40 | | |||
uint64(buf[2])<<48 | | |||
uint64(buf[3])<<56) | |||
return scaleBytes(strconv.FormatInt(money, 10), 4) | |||
return decimal.ScaleBytes(strconv.FormatInt(money, 10), 4) | |||
} | |||
func decodeMoney4(buf []byte) []byte { | |||
money := int32(binary.LittleEndian.Uint32(buf[0:4])) | |||
return scaleBytes(strconv.FormatInt(int64(money), 10), 4) | |||
return decimal.ScaleBytes(strconv.FormatInt(int64(money), 10), 4) | |||
} | |||
func decodeGuid(buf []byte) []byte { | |||
@@ -835,15 +836,14 @@ func decodeGuid(buf []byte) []byte { | |||
func decodeDecimal(prec uint8, scale uint8, buf []byte) []byte { | |||
var sign uint8 | |||
sign = buf[0] | |||
dec := Decimal{ | |||
positive: sign != 0, | |||
prec: prec, | |||
scale: scale, | |||
} | |||
var dec decimal.Decimal | |||
dec.SetPositive(sign != 0) | |||
dec.SetPrec(prec) | |||
dec.SetScale(scale) | |||
buf = buf[1:] | |||
l := len(buf) / 4 | |||
for i := 0; i < l; i++ { | |||
dec.integer[i] = binary.LittleEndian.Uint32(buf[0:4]) | |||
dec.SetInteger(binary.LittleEndian.Uint32(buf[0:4]), uint8(i)) | |||
buf = buf[4:] | |||
} | |||
return dec.Bytes() | |||
@@ -1186,7 +1186,7 @@ func makeDecl(ti typeInfo) string { | |||
case typeBigChar, typeChar: | |||
return fmt.Sprintf("char(%d)", ti.Size) | |||
case typeBigVarChar, typeVarChar: | |||
if ti.Size > 4000 || ti.Size == 0 { | |||
if ti.Size > 8000 || ti.Size == 0 { | |||
return fmt.Sprintf("varchar(max)") | |||
} else { | |||
return fmt.Sprintf("varchar(%d)", ti.Size) |
@@ -72,3 +72,9 @@ func (u UniqueIdentifier) Value() (driver.Value, error) { | |||
func (u UniqueIdentifier) String() string { | |||
return fmt.Sprintf("%X-%X-%X-%X-%X", u[0:4], u[4:6], u[6:8], u[8:10], u[10:]) | |||
} | |||
// MarshalText converts Uniqueidentifier to bytes corresponding to the stringified hexadecimal representation of the Uniqueidentifier | |||
// e.g., "AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA" -> [65 65 65 65 65 65 65 65 45 65 65 65 65 45 65 65 65 65 45 65 65 65 65 65 65 65 65 65 65 65 65] | |||
func (u UniqueIdentifier) MarshalText() []byte { | |||
return []byte(u.String()) | |||
} |
@@ -0,0 +1,73 @@ | |||
# Contributing | |||
1. Sign one of the contributor license agreements below. | |||
#### Running | |||
Once you've done the necessary setup, you can run the integration tests by | |||
running: | |||
``` sh | |||
$ go test -v github.com/golang-sql/civil | |||
``` | |||
## Contributor License Agreements | |||
Before we can accept your pull requests you'll need to sign a Contributor | |||
License Agreement (CLA): | |||
- **If you are an individual writing original source code** and **you own the | |||
intellectual property**, then you'll need to sign an [individual CLA][indvcla]. | |||
- **If you work for a company that wants to allow you to contribute your | |||
work**, then you'll need to sign a [corporate CLA][corpcla]. | |||
You can sign these electronically (just scroll to the bottom). After that, | |||
we'll be able to accept your pull requests. | |||
## Contributor Code of Conduct | |||
As contributors and maintainers of this project, | |||
and in the interest of fostering an open and welcoming community, | |||
we pledge to respect all people who contribute through reporting issues, | |||
posting feature requests, updating documentation, | |||
submitting pull requests or patches, and other activities. | |||
We are committed to making participation in this project | |||
a harassment-free experience for everyone, | |||
regardless of level of experience, gender, gender identity and expression, | |||
sexual orientation, disability, personal appearance, | |||
body size, race, ethnicity, age, religion, or nationality. | |||
Examples of unacceptable behavior by participants include: | |||
* The use of sexualized language or imagery | |||
* Personal attacks | |||
* Trolling or insulting/derogatory comments | |||
* Public or private harassment | |||
* Publishing other's private information, | |||
such as physical or electronic | |||
addresses, without explicit permission | |||
* Other unethical or unprofessional conduct. | |||
Project maintainers have the right and responsibility to remove, edit, or reject | |||
comments, commits, code, wiki edits, issues, and other contributions | |||
that are not aligned to this Code of Conduct. | |||
By adopting this Code of Conduct, | |||
project maintainers commit themselves to fairly and consistently | |||
applying these principles to every aspect of managing this project. | |||
Project maintainers who do not follow or enforce the Code of Conduct | |||
may be permanently removed from the project team. | |||
This code of conduct applies both within project spaces and in public spaces | |||
when an individual is representing the project or its community. | |||
Instances of abusive, harassing, or otherwise unacceptable behavior | |||
may be reported by opening an issue | |||
or contacting one or more of the project maintainers. | |||
This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, | |||
available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) | |||
[gcloudcli]: https://developers.google.com/cloud/sdk/gcloud/ | |||
[indvcla]: https://developers.google.com/open-source/cla/individual | |||
[corpcla]: https://developers.google.com/open-source/cla/corporate |
@@ -0,0 +1,202 @@ | |||
Apache License | |||
Version 2.0, January 2004 | |||
http://www.apache.org/licenses/ | |||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION | |||
1. Definitions. | |||
"License" shall mean the terms and conditions for use, reproduction, | |||
and distribution as defined by Sections 1 through 9 of this document. | |||
"Licensor" shall mean the copyright owner or entity authorized by | |||
the copyright owner that is granting the License. | |||
"Legal Entity" shall mean the union of the acting entity and all | |||
other entities that control, are controlled by, or are under common | |||
control with that entity. For the purposes of this definition, | |||
"control" means (i) the power, direct or indirect, to cause the | |||
direction or management of such entity, whether by contract or | |||
otherwise, or (ii) ownership of fifty percent (50%) or more of the | |||
outstanding shares, or (iii) beneficial ownership of such entity. | |||
"You" (or "Your") shall mean an individual or Legal Entity | |||
exercising permissions granted by this License. | |||
"Source" form shall mean the preferred form for making modifications, | |||
including but not limited to software source code, documentation | |||
source, and configuration files. | |||
"Object" form shall mean any form resulting from mechanical | |||
transformation or translation of a Source form, including but | |||
not limited to compiled object code, generated documentation, | |||
and conversions to other media types. | |||
"Work" shall mean the work of authorship, whether in Source or | |||
Object form, made available under the License, as indicated by a | |||
copyright notice that is included in or attached to the work | |||
(an example is provided in the Appendix below). | |||
"Derivative Works" shall mean any work, whether in Source or Object | |||
form, that is based on (or derived from) the Work and for which the | |||
editorial revisions, annotations, elaborations, or other modifications | |||
represent, as a whole, an original work of authorship. For the purposes | |||
of this License, Derivative Works shall not include works that remain | |||
separable from, or merely link (or bind by name) to the interfaces of, | |||
the Work and Derivative Works thereof. | |||
"Contribution" shall mean any work of authorship, including | |||
the original version of the Work and any modifications or additions | |||
to that Work or Derivative Works thereof, that is intentionally | |||
submitted to Licensor for inclusion in the Work by the copyright owner | |||
or by an individual or Legal Entity authorized to submit on behalf of | |||
the copyright owner. For the purposes of this definition, "submitted" | |||
means any form of electronic, verbal, or written communication sent | |||
to the Licensor or its representatives, including but not limited to | |||
communication on electronic mailing lists, source code control systems, | |||
and issue tracking systems that are managed by, or on behalf of, the | |||
Licensor for the purpose of discussing and improving the Work, but | |||
excluding communication that is conspicuously marked or otherwise | |||
designated in writing by the copyright owner as "Not a Contribution." | |||
"Contributor" shall mean Licensor and any individual or Legal Entity | |||
on behalf of whom a Contribution has been received by Licensor and | |||
subsequently incorporated within the Work. | |||
2. Grant of Copyright License. Subject to the terms and conditions of | |||
this License, each Contributor hereby grants to You a perpetual, | |||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable | |||
copyright license to reproduce, prepare Derivative Works of, | |||
publicly display, publicly perform, sublicense, and distribute the | |||
Work and such Derivative Works in Source or Object form. | |||
3. Grant of Patent License. Subject to the terms and conditions of | |||
this License, each Contributor hereby grants to You a perpetual, | |||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable | |||
(except as stated in this section) patent license to make, have made, | |||
use, offer to sell, sell, import, and otherwise transfer the Work, | |||
where such license applies only to those patent claims licensable | |||
by such Contributor that are necessarily infringed by their | |||
Contribution(s) alone or by combination of their Contribution(s) | |||
with the Work to which such Contribution(s) was submitted. If You | |||
institute patent litigation against any entity (including a | |||
cross-claim or counterclaim in a lawsuit) alleging that the Work | |||
or a Contribution incorporated within the Work constitutes direct | |||
or contributory patent infringement, then any patent licenses | |||
granted to You under this License for that Work shall terminate | |||
as of the date such litigation is filed. | |||
4. Redistribution. You may reproduce and distribute copies of the | |||
Work or Derivative Works thereof in any medium, with or without | |||
modifications, and in Source or Object form, provided that You | |||
meet the following conditions: | |||
(a) You must give any other recipients of the Work or | |||
Derivative Works a copy of this License; and | |||
(b) You must cause any modified files to carry prominent notices | |||
stating that You changed the files; and | |||
(c) You must retain, in the Source form of any Derivative Works | |||
that You distribute, all copyright, patent, trademark, and | |||
attribution notices from the Source form of the Work, | |||
excluding those notices that do not pertain to any part of | |||
the Derivative Works; and | |||
(d) If the Work includes a "NOTICE" text file as part of its | |||
distribution, then any Derivative Works that You distribute must | |||
include a readable copy of the attribution notices contained | |||
within such NOTICE file, excluding those notices that do not | |||
pertain to any part of the Derivative Works, in at least one | |||
of the following places: within a NOTICE text file distributed | |||
as part of the Derivative Works; within the Source form or | |||
documentation, if provided along with the Derivative Works; or, | |||
within a display generated by the Derivative Works, if and | |||
wherever such third-party notices normally appear. The contents | |||
of the NOTICE file are for informational purposes only and | |||
do not modify the License. You may add Your own attribution | |||
notices within Derivative Works that You distribute, alongside | |||
or as an addendum to the NOTICE text from the Work, provided | |||
that such additional attribution notices cannot be construed | |||
as modifying the License. | |||
You may add Your own copyright statement to Your modifications and | |||
may provide additional or different license terms and conditions | |||
for use, reproduction, or distribution of Your modifications, or | |||
for any such Derivative Works as a whole, provided Your use, | |||
reproduction, and distribution of the Work otherwise complies with | |||
the conditions stated in this License. | |||
5. Submission of Contributions. Unless You explicitly state otherwise, | |||
any Contribution intentionally submitted for inclusion in the Work | |||
by You to the Licensor shall be under the terms and conditions of | |||
this License, without any additional terms or conditions. | |||
Notwithstanding the above, nothing herein shall supersede or modify | |||
the terms of any separate license agreement you may have executed | |||
with Licensor regarding such Contributions. | |||
6. Trademarks. This License does not grant permission to use the trade | |||
names, trademarks, service marks, or product names of the Licensor, | |||
except as required for reasonable and customary use in describing the | |||
origin of the Work and reproducing the content of the NOTICE file. | |||
7. Disclaimer of Warranty. Unless required by applicable law or | |||
agreed to in writing, Licensor provides the Work (and each | |||
Contributor provides its Contributions) on an "AS IS" BASIS, | |||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | |||
implied, including, without limitation, any warranties or conditions | |||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A | |||
PARTICULAR PURPOSE. You are solely responsible for determining the | |||
appropriateness of using or redistributing the Work and assume any | |||
risks associated with Your exercise of permissions under this License. | |||
8. Limitation of Liability. In no event and under no legal theory, | |||
whether in tort (including negligence), contract, or otherwise, | |||
unless required by applicable law (such as deliberate and grossly | |||
negligent acts) or agreed to in writing, shall any Contributor be | |||
liable to You for damages, including any direct, indirect, special, | |||
incidental, or consequential damages of any character arising as a | |||
result of this License or out of the use or inability to use the | |||
Work (including but not limited to damages for loss of goodwill, | |||
work stoppage, computer failure or malfunction, or any and all | |||
other commercial damages or losses), even if such Contributor | |||
has been advised of the possibility of such damages. | |||
9. Accepting Warranty or Additional Liability. While redistributing | |||
the Work or Derivative Works thereof, You may choose to offer, | |||
and charge a fee for, acceptance of support, warranty, indemnity, | |||
or other liability obligations and/or rights consistent with this | |||
License. However, in accepting such obligations, You may act only | |||
on Your own behalf and on Your sole responsibility, not on behalf | |||
of any other Contributor, and only if You agree to indemnify, | |||
defend, and hold each Contributor harmless for any liability | |||
incurred by, or claims asserted against, such Contributor by reason | |||
of your accepting any such warranty or additional liability. | |||
END OF TERMS AND CONDITIONS | |||
APPENDIX: How to apply the Apache License to your work. | |||
To apply the Apache License to your work, attach the following | |||
boilerplate notice, with the fields enclosed by brackets "[]" | |||
replaced with your own identifying information. (Don't include | |||
the brackets!) The text should be enclosed in the appropriate | |||
comment syntax for the file format. We also recommend that a | |||
file or class name and description of purpose be included on the | |||
same "printed page" as the copyright notice for easier | |||
identification within third-party archives. | |||
Copyright [yyyy] [name of copyright owner] | |||
Licensed under the Apache License, Version 2.0 (the "License"); | |||
you may not use this file except in compliance with the License. | |||
You may obtain a copy of the License at | |||
http://www.apache.org/licenses/LICENSE-2.0 | |||
Unless required by applicable law or agreed to in writing, software | |||
distributed under the License is distributed on an "AS IS" BASIS, | |||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |||
See the License for the specific language governing permissions and | |||
limitations under the License. |
@@ -0,0 +1,15 @@ | |||
# Civil Date and Time | |||
[![GoDoc](https://godoc.org/github.com/golang-sql/civil?status.svg)](https://godoc.org/github.com/golang-sql/civil) | |||
Civil provides Date, Time of Day, and DateTime data types. | |||
While there are many uses, using specific types when working | |||
with databases make is conceptually eaiser to understand what value | |||
is set in the remote system. | |||
## Source | |||
This civil package was extracted and forked from `cloud.google.com/go/civil`. | |||
As such the license and contributing requirements remain the same as that | |||
module. |
@@ -3,18 +3,18 @@ module github.com/lafriks/xormstore | |||
go 1.11 | |||
require ( | |||
cloud.google.com/go v0.44.3 // indirect | |||
github.com/denisenkom/go-mssqldb v0.0.0-20190820223206-44cdfe8d8ba9 | |||
github.com/davecgh/go-spew v1.1.1 // indirect | |||
github.com/denisenkom/go-mssqldb v0.0.0-20190924004331-208c0a498538 | |||
github.com/go-sql-driver/mysql v1.4.1 | |||
github.com/go-xorm/xorm v0.7.6 | |||
github.com/google/go-cmp v0.3.1 // indirect | |||
github.com/go-xorm/xorm v0.7.8 | |||
github.com/gorilla/context v1.1.1 | |||
github.com/gorilla/securecookie v1.1.1 | |||
github.com/gorilla/sessions v1.2.0 | |||
github.com/jackc/pgx v3.5.0+incompatible // indirect | |||
github.com/kr/pretty v0.1.0 // indirect | |||
github.com/lib/pq v1.2.0 | |||
github.com/mattn/go-sqlite3 v1.11.0 | |||
github.com/stretchr/testify v1.4.0 // indirect | |||
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 // indirect | |||
xorm.io/core v0.7.0 | |||
golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad // indirect | |||
google.golang.org/appengine v1.6.4 // indirect | |||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect | |||
xorm.io/core v0.7.2 | |||
) |
@@ -2,13 +2,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT | |||
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= | |||
cloud.google.com/go v0.37.4 h1:glPeL3BQJsbF6aIIYfZizMwc5LTYz250bDMjttbBGAU= | |||
cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw= | |||
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= | |||
cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= | |||
cloud.google.com/go v0.44.3 h1:0sMegbmn/8uTwpNkB0q9cLEpZ2W5a6kl+wtBQgPWBJQ= | |||
cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= | |||
cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= | |||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= | |||
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= | |||
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= | |||
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= | |||
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= | |||
@@ -22,8 +16,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs | |||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= | |||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | |||
github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= | |||
github.com/denisenkom/go-mssqldb v0.0.0-20190820223206-44cdfe8d8ba9 h1:r05vdZzhwcLFTrNCNirAQEL30b/tlqnI0ow7BCcUiT4= | |||
github.com/denisenkom/go-mssqldb v0.0.0-20190820223206-44cdfe8d8ba9/go.mod h1:uU0N10vx1abI4qeVe79CxepBP6PPREVTgMS5Gx6/mOk= | |||
github.com/denisenkom/go-mssqldb v0.0.0-20190924004331-208c0a498538 h1:bpWCJ5MddHsv4Xtl3azkK89mZzd/vvut32mvAnKbyUA= | |||
github.com/denisenkom/go-mssqldb v0.0.0-20190924004331-208c0a498538/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= | |||
github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= | |||
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= | |||
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= | |||
@@ -35,30 +29,25 @@ github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG | |||
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= | |||
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y= | |||
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM= | |||
github.com/go-xorm/xorm v0.7.6 h1:qFbuobVfAYzMlf9C8hrLnp4B17VUEIH0eZuZ0IfXWjo= | |||
github.com/go-xorm/xorm v0.7.6/go.mod h1:nqz2TAsuOHWH2yk4FYWtacCGgdbrcdZ5mF1XadqEHls= | |||
github.com/go-xorm/xorm v0.7.8 h1:rKxZJB9mWQ9Nw2TbjsepiThR031jkGePOWXwTtEAU08= | |||
github.com/go-xorm/xorm v0.7.8/go.mod h1:XiVxrMMIhFkwSkh96BW7PACl7UhLtx2iJIHMdmjh5sQ= | |||
github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= | |||
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= | |||
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= | |||
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= | |||
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= | |||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= | |||
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= | |||
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= | |||
github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= | |||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= | |||
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= | |||
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= | |||
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= | |||
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= | |||
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= | |||
github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= | |||
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= | |||
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= | |||
github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= | |||
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= | |||
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= | |||
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= | |||
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= | |||
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= | |||
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= | |||
github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= | |||
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= | |||
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= | |||
@@ -67,14 +56,10 @@ github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+ | |||
github.com/gorilla/sessions v1.2.0 h1:S7P+1Hm5V/AT9cjEcUD5uDaQSX0OE577aCXgoaKpYbQ= | |||
github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= | |||
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= | |||
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= | |||
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= | |||
github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc= | |||
github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ= | |||
github.com/jackc/pgx v3.3.0+incompatible h1:Wa90/+qsITBAPkAZjiByeIGHFcj3Ztu+VzrrIpHjL90= | |||
github.com/jackc/pgx v3.3.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= | |||
github.com/jackc/pgx v3.5.0+incompatible h1:BRJ4G3UPtvml5R1ey0biqqGuYUGayMYekm3woO75orY= | |||
github.com/jackc/pgx v3.5.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= | |||
github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= | |||
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= | |||
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= | |||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= | |||
@@ -113,8 +98,6 @@ github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 | |||
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= | |||
github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= | |||
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= | |||
github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= | |||
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= | |||
github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE= | |||
github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= | |||
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= | |||
@@ -128,24 +111,17 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P | |||
github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= | |||
github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= | |||
go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= | |||
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= | |||
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= | |||
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= | |||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | |||
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c h1:Vj5n4GlwjmQteupaxJ9+0FNOmBrHfq7vN4btdGoDZgI= | |||
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | |||
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | |||
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0= | |||
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | |||
golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad h1:5E5raQxcv+6CZ11RrBYQe5WRbUIWpScjh0kvHZkZIrQ= | |||
golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | |||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= | |||
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= | |||
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= | |||
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= | |||
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= | |||
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= | |||
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= | |||
golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= | |||
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= | |||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |||
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |||
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |||
@@ -155,13 +131,9 @@ golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73r | |||
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= | |||
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | |||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | |||
golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | |||
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | |||
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= | |||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | |||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= | |||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= | |||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= | |||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | |||
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | |||
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | |||
@@ -173,57 +145,37 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h | |||
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | |||
golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | |||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | |||
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | |||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | |||
golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | |||
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | |||
golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | |||
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | |||
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | |||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | |||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | |||
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= | |||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= | |||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= | |||
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= | |||
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | |||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | |||
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | |||
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= | |||
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= | |||
golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= | |||
golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= | |||
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= | |||
golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= | |||
golang.org/x/tools v0.0.0-20190606050223-4d9ae51c2468/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= | |||
golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= | |||
golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= | |||
google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= | |||
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= | |||
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= | |||
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= | |||
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= | |||
google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= | |||
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= | |||
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= | |||
google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= | |||
google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I= | |||
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= | |||
google.golang.org/appengine v1.6.4 h1:WiKh4+/eMB2HaY7QhCfW/R7MuRAoA8QMCSJA6jP5/fo= | |||
google.golang.org/appengine v1.6.4/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= | |||
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= | |||
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= | |||
google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= | |||
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= | |||
google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= | |||
google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= | |||
google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= | |||
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= | |||
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= | |||
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= | |||
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= | |||
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= | |||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | |||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= | |||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | |||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= | |||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | |||
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= | |||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= | |||
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | |||
@@ -232,9 +184,9 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | |||
honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= | |||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= | |||
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= | |||
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= | |||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= | |||
xorm.io/builder v0.3.5 h1:EilU39fvWDxjb1cDaELpYhsF+zziRBhew8xk4pngO+A= | |||
xorm.io/builder v0.3.5/go.mod h1:ZFbByS/KxZI1FKRjL05PyJ4YrK2bcxlUaAxdum5aTR8= | |||
xorm.io/core v0.7.0 h1:hKxuOKWZNeiFQsSuGet/KV8HZ788hclvAl+7azx3tkM= | |||
xorm.io/core v0.7.0/go.mod h1:TuOJjIVa7e3w/rN8tDcAvuLBMtwzdHPbyOzE6Gk1EUI= | |||
xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8= | |||
xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU= | |||
xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb h1:msX3zG3BPl8Ti+LDzP33/9K7BzO/WqFXk610K1kYKfo= | |||
xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM= | |||
xorm.io/core v0.7.2 h1:mEO22A2Z7a3fPaZMk6gKL/jMD80iiyNwRrX5HOv3XLw= | |||
xorm.io/core v0.7.2/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM= |
@@ -4,7 +4,10 @@ | |||
// Package acme provides an implementation of the | |||
// Automatic Certificate Management Environment (ACME) spec. | |||
// See https://tools.ietf.org/html/draft-ietf-acme-acme-02 for details. | |||
// The intial implementation was based on ACME draft-02 and | |||
// is now being extended to comply with RFC8555. | |||
// See https://tools.ietf.org/html/draft-ietf-acme-acme-02 | |||
// and https://tools.ietf.org/html/rfc8555 for details. | |||
// | |||
// Most common scenarios will want to use autocert subdirectory instead, | |||
// which provides automatic access to certificates from Let's Encrypt | |||
@@ -116,21 +119,49 @@ type Client struct { | |||
// identifiable by the server, in case they are causing issues. | |||
UserAgent string | |||
dirMu sync.Mutex // guards writes to dir | |||
dir *Directory // cached result of Client's Discover method | |||
cacheMu sync.Mutex | |||
dir *Directory // cached result of Client's Discover method | |||
kid keyID // cached Account.URI obtained from registerRFC or getAccountRFC | |||
noncesMu sync.Mutex | |||
nonces map[string]struct{} // nonces collected from previous responses | |||
} | |||
// accountKID returns a key ID associated with c.Key, the account identity | |||
// provided by the CA during RFC based registration. | |||
// It assumes c.Discover has already been called. | |||
// | |||
// accountKID requires at most one network roundtrip. | |||
// It caches only successful result. | |||
// | |||
// When in pre-RFC mode or when c.getRegRFC responds with an error, accountKID | |||
// returns noKeyID. | |||
func (c *Client) accountKID(ctx context.Context) keyID { | |||
c.cacheMu.Lock() | |||
defer c.cacheMu.Unlock() | |||
if c.dir.OrderURL == "" { | |||
// Assume legacy CA. | |||
return noKeyID | |||
} | |||
if c.kid != noKeyID { | |||
return c.kid | |||
} | |||
a, err := c.getRegRFC(ctx) | |||
if err != nil { | |||
return noKeyID | |||
} | |||
c.kid = keyID(a.URI) | |||
return c.kid | |||
} | |||
// Discover performs ACME server discovery using c.DirectoryURL. | |||
// | |||
// It caches successful result. So, subsequent calls will not result in | |||
// a network round-trip. This also means mutating c.DirectoryURL after successful call | |||
// of this method will have no effect. | |||
func (c *Client) Discover(ctx context.Context) (Directory, error) { | |||
c.dirMu.Lock() | |||
defer c.dirMu.Unlock() | |||
c.cacheMu.Lock() | |||
defer c.cacheMu.Unlock() | |||
if c.dir != nil { | |||
return *c.dir, nil | |||
} | |||
@@ -143,27 +174,53 @@ func (c *Client) Discover(ctx context.Context) (Directory, error) { | |||
c.addNonce(res.Header) | |||
var v struct { | |||
Reg string `json:"new-reg"` | |||
Authz string `json:"new-authz"` | |||
Cert string `json:"new-cert"` | |||
Revoke string `json:"revoke-cert"` | |||
Meta struct { | |||
Terms string `json:"terms-of-service"` | |||
Website string `json:"website"` | |||
CAA []string `json:"caa-identities"` | |||
Reg string `json:"new-reg"` | |||
RegRFC string `json:"newAccount"` | |||
Authz string `json:"new-authz"` | |||
AuthzRFC string `json:"newAuthz"` | |||
OrderRFC string `json:"newOrder"` | |||
Cert string `json:"new-cert"` | |||
Revoke string `json:"revoke-cert"` | |||
RevokeRFC string `json:"revokeCert"` | |||
NonceRFC string `json:"newNonce"` | |||
KeyChangeRFC string `json:"keyChange"` | |||
Meta struct { | |||
Terms string `json:"terms-of-service"` | |||
TermsRFC string `json:"termsOfService"` | |||
WebsiteRFC string `json:"website"` | |||
CAA []string `json:"caa-identities"` | |||
CAARFC []string `json:"caaIdentities"` | |||
ExternalAcctRFC bool `json:"externalAccountRequired"` | |||
} | |||
} | |||
if err := json.NewDecoder(res.Body).Decode(&v); err != nil { | |||
return Directory{}, err | |||
} | |||
if v.OrderRFC == "" { | |||
// Non-RFC compliant ACME CA. | |||
c.dir = &Directory{ | |||
RegURL: v.Reg, | |||
AuthzURL: v.Authz, | |||
CertURL: v.Cert, | |||
RevokeURL: v.Revoke, | |||
Terms: v.Meta.Terms, | |||
Website: v.Meta.WebsiteRFC, | |||
CAA: v.Meta.CAA, | |||
} | |||
return *c.dir, nil | |||
} | |||
// RFC compliant ACME CA. | |||
c.dir = &Directory{ | |||
RegURL: v.Reg, | |||
AuthzURL: v.Authz, | |||
CertURL: v.Cert, | |||
RevokeURL: v.Revoke, | |||
Terms: v.Meta.Terms, | |||
Website: v.Meta.Website, | |||
CAA: v.Meta.CAA, | |||
RegURL: v.RegRFC, | |||
AuthzURL: v.AuthzRFC, | |||
OrderURL: v.OrderRFC, | |||
RevokeURL: v.RevokeRFC, | |||
NonceURL: v.NonceRFC, | |||
KeyChangeURL: v.KeyChangeRFC, | |||
Terms: v.Meta.TermsRFC, | |||
Website: v.Meta.WebsiteRFC, | |||
CAA: v.Meta.CAARFC, | |||
ExternalAccountRequired: v.Meta.ExternalAcctRFC, | |||
} | |||
return *c.dir, nil | |||
} | |||
@@ -206,7 +263,7 @@ func (c *Client) CreateCert(ctx context.Context, csr []byte, exp time.Duration, | |||
req.NotAfter = now.Add(exp).Format(time.RFC3339) | |||
} | |||
res, err := c.post(ctx, c.Key, c.dir.CertURL, req, wantStatus(http.StatusCreated)) | |||
res, err := c.post(ctx, nil, c.dir.CertURL, req, wantStatus(http.StatusCreated)) | |||
if err != nil { | |||
return nil, "", err | |||
} | |||
@@ -260,9 +317,6 @@ func (c *Client) RevokeCert(ctx context.Context, key crypto.Signer, cert []byte, | |||
Cert: base64.RawURLEncoding.EncodeToString(cert), | |||
Reason: int(reason), | |||
} | |||
if key == nil { | |||
key = c.Key | |||
} | |||
res, err := c.post(ctx, key, c.dir.RevokeURL, body, wantStatus(http.StatusOK)) | |||
if err != nil { | |||
return err | |||
@@ -275,20 +329,32 @@ func (c *Client) RevokeCert(ctx context.Context, key crypto.Signer, cert []byte, | |||
// during account registration. See Register method of Client for more details. | |||
func AcceptTOS(tosURL string) bool { return true } | |||
// Register creates a new account registration by following the "new-reg" flow. | |||
// It returns the registered account. The account is not modified. | |||
// Register creates a new account with the CA using c.Key. | |||
// It returns the registered account. The account acct is not modified. | |||
// | |||
// The registration may require the caller to agree to the CA's Terms of Service (TOS). | |||
// If so, and the account has not indicated the acceptance of the terms (see Account for details), | |||
// Register calls prompt with a TOS URL provided by the CA. Prompt should report | |||
// whether the caller agrees to the terms. To always accept the terms, the caller can use AcceptTOS. | |||
func (c *Client) Register(ctx context.Context, a *Account, prompt func(tosURL string) bool) (*Account, error) { | |||
if _, err := c.Discover(ctx); err != nil { | |||
// | |||
// When interfacing with RFC compliant CA, non-RFC8555 compliant fields of acct are ignored | |||
// and prompt is called if Directory's Terms field is non-zero. | |||
// Also see Error's Instance field for when a CA requires already registered accounts to agree | |||
// to an updated Terms of Service. | |||
func (c *Client) Register(ctx context.Context, acct *Account, prompt func(tosURL string) bool) (*Account, error) { | |||
dir, err := c.Discover(ctx) | |||
if err != nil { | |||
return nil, err | |||
} | |||
var err error | |||
if a, err = c.doReg(ctx, c.dir.RegURL, "new-reg", a); err != nil { | |||
// RFC8555 compliant account registration. | |||
if dir.OrderURL != "" { | |||
return c.registerRFC(ctx, acct, prompt) | |||
} | |||
// Legacy ACME draft registration flow. | |||
a, err := c.doReg(ctx, dir.RegURL, "new-reg", acct) | |||
if err != nil { | |||
return nil, err | |||
} | |||
var accept bool | |||
@@ -302,9 +368,22 @@ func (c *Client) Register(ctx context.Context, a *Account, prompt func(tosURL st | |||
return a, err | |||
} | |||
// GetReg retrieves an existing registration. | |||
// The url argument is an Account URI. | |||
// GetReg retrieves an existing account associated with c.Key. | |||
// | |||
// The url argument is an Account URI used with pre-RFC8555 CAs. | |||
// It is ignored when interfacing with an RFC compliant CA. | |||
func (c *Client) GetReg(ctx context.Context, url string) (*Account, error) { | |||
dir, err := c.Discover(ctx) | |||
if err != nil { | |||
return nil, err | |||
} | |||
// Assume RFC8555 compliant CA. | |||
if dir.OrderURL != "" { | |||
return c.getRegRFC(ctx) | |||
} | |||
// Legacy CA. | |||
a, err := c.doReg(ctx, url, "reg", nil) | |||
if err != nil { | |||
return nil, err | |||
@@ -315,9 +394,23 @@ func (c *Client) GetReg(ctx context.Context, url string) (*Account, error) { | |||
// UpdateReg updates an existing registration. | |||
// It returns an updated account copy. The provided account is not modified. | |||
func (c *Client) UpdateReg(ctx context.Context, a *Account) (*Account, error) { | |||
uri := a.URI | |||
a, err := c.doReg(ctx, uri, "reg", a) | |||
// | |||
// When interfacing with RFC compliant CAs, a.URI is ignored and the account URL | |||
// associated with c.Key is used instead. | |||
func (c *Client) UpdateReg(ctx context.Context, acct *Account) (*Account, error) { | |||
dir, err := c.Discover(ctx) | |||
if err != nil { | |||
return nil, err | |||
} | |||
// Assume RFC8555 compliant CA. | |||
if dir.OrderURL != "" { | |||
return c.updateRegRFC(ctx, acct) | |||
} | |||
// Legacy CA. | |||
uri := acct.URI | |||
a, err := c.doReg(ctx, uri, "reg", acct) | |||
if err != nil { | |||
return nil, err | |||
} | |||
@@ -362,7 +455,7 @@ func (c *Client) authorize(ctx context.Context, typ, val string) (*Authorization | |||
Resource: "new-authz", | |||
Identifier: authzID{Type: typ, Value: val}, | |||
} | |||
res, err := c.post(ctx, c.Key, c.dir.AuthzURL, req, wantStatus(http.StatusCreated)) | |||
res, err := c.post(ctx, nil, c.dir.AuthzURL, req, wantStatus(http.StatusCreated)) | |||
if err != nil { | |||
return nil, err | |||
} | |||
@@ -405,6 +498,11 @@ func (c *Client) GetAuthorization(ctx context.Context, url string) (*Authorizati | |||
// | |||
// It does not revoke existing certificates. | |||
func (c *Client) RevokeAuthorization(ctx context.Context, url string) error { | |||
// Required for c.accountKID() when in RFC mode. | |||
if _, err := c.Discover(ctx); err != nil { | |||
return err | |||
} | |||
req := struct { | |||
Resource string `json:"resource"` | |||
Status string `json:"status"` | |||
@@ -414,7 +512,7 @@ func (c *Client) RevokeAuthorization(ctx context.Context, url string) error { | |||
Status: "deactivated", | |||
Delete: true, | |||
} | |||
res, err := c.post(ctx, c.Key, url, req, wantStatus(http.StatusOK)) | |||
res, err := c.post(ctx, nil, url, req, wantStatus(http.StatusOK)) | |||
if err != nil { | |||
return err | |||
} | |||
@@ -491,6 +589,11 @@ func (c *Client) GetChallenge(ctx context.Context, url string) (*Challenge, erro | |||
// | |||
// The server will then perform the validation asynchronously. | |||
func (c *Client) Accept(ctx context.Context, chal *Challenge) (*Challenge, error) { | |||
// Required for c.accountKID() when in RFC mode. | |||
if _, err := c.Discover(ctx); err != nil { | |||
return nil, err | |||
} | |||
auth, err := keyAuth(c.Key.Public(), chal.Token) | |||
if err != nil { | |||
return nil, err | |||
@@ -505,7 +608,7 @@ func (c *Client) Accept(ctx context.Context, chal *Challenge) (*Challenge, error | |||
Type: chal.Type, | |||
Auth: auth, | |||
} | |||
res, err := c.post(ctx, c.Key, chal.URI, req, wantStatus( | |||
res, err := c.post(ctx, nil, chal.URI, req, wantStatus( | |||
http.StatusOK, // according to the spec | |||
http.StatusAccepted, // Let's Encrypt: see https://goo.gl/WsJ7VT (acme-divergences.md) | |||
)) | |||
@@ -682,7 +785,7 @@ func (c *Client) doReg(ctx context.Context, url string, typ string, acct *Accoun | |||
req.Contact = acct.Contact | |||
req.Agreement = acct.AgreedTerms | |||
} | |||
res, err := c.post(ctx, c.Key, url, req, wantStatus( | |||
res, err := c.post(ctx, nil, url, req, wantStatus( | |||
http.StatusOK, // updates and deletes | |||
http.StatusCreated, // new account creation | |||
http.StatusAccepted, // Let's Encrypt divergent implementation | |||
@@ -721,12 +824,16 @@ func (c *Client) doReg(ctx context.Context, url string, typ string, acct *Accoun | |||
} | |||
// popNonce returns a nonce value previously stored with c.addNonce | |||
// or fetches a fresh one from a URL by issuing a HEAD request. | |||
// It first tries c.directoryURL() and then the provided url if the former fails. | |||
// or fetches a fresh one from c.dir.NonceURL. | |||
// If NonceURL is empty, it first tries c.directoryURL() and, failing that, | |||
// the provided url. | |||
func (c *Client) popNonce(ctx context.Context, url string) (string, error) { | |||
c.noncesMu.Lock() | |||
defer c.noncesMu.Unlock() | |||
if len(c.nonces) == 0 { | |||
if c.dir != nil && c.dir.NonceURL != "" { | |||
return c.fetchNonce(ctx, c.dir.NonceURL) | |||
} | |||
dirURL := c.directoryURL() | |||
v, err := c.fetchNonce(ctx, dirURL) | |||
if err != nil && url != dirURL { |
@@ -88,9 +88,9 @@ func defaultHostPolicy(context.Context, string) error { | |||
} | |||
// Manager is a stateful certificate manager built on top of acme.Client. | |||
// It obtains and refreshes certificates automatically using "tls-alpn-01", | |||
// "tls-sni-01", "tls-sni-02" and "http-01" challenge types, | |||
// as well as providing them to a TLS server via tls.Config. | |||
// It obtains and refreshes certificates automatically using "tls-alpn-01" | |||
// or "http-01" challenge types, as well as providing them to a TLS server | |||
// via tls.Config. | |||
// | |||
// You must specify a cache implementation, such as DirCache, | |||
// to reuse obtained certificates across program restarts. | |||
@@ -184,10 +184,8 @@ type Manager struct { | |||
// to be provisioned. | |||
// The entries are stored for the duration of the authorization flow. | |||
httpTokens map[string][]byte | |||
// certTokens contains temporary certificates for tls-sni and tls-alpn challenges | |||
// and is keyed by token domain name, which matches server name of ClientHello. | |||
// Keys always have ".acme.invalid" suffix for tls-sni. Otherwise, they are domain names | |||
// for tls-alpn. | |||
// certTokens contains temporary certificates for tls-alpn-01 challenges | |||
// and is keyed by the domain name which matches the ClientHello server name. | |||
// The entries are stored for the duration of the authorization flow. | |||
certTokens map[string]*tls.Certificate | |||
// nowFunc, if not nil, returns the current time. This may be set for | |||
@@ -226,7 +224,7 @@ func (m *Manager) TLSConfig() *tls.Config { | |||
// GetCertificate implements the tls.Config.GetCertificate hook. | |||
// It provides a TLS certificate for hello.ServerName host, including answering | |||
// tls-alpn-01 and *.acme.invalid (tls-sni-01 and tls-sni-02) challenges. | |||
// tls-alpn-01 challenges. | |||
// All other fields of hello are ignored. | |||
// | |||
// If m.HostPolicy is non-nil, GetCertificate calls the policy before requesting | |||
@@ -235,9 +233,7 @@ func (m *Manager) TLSConfig() *tls.Config { | |||
// This does not affect cached certs. See HostPolicy field description for more details. | |||
// | |||
// If GetCertificate is used directly, instead of via Manager.TLSConfig, package users will | |||
// also have to add acme.ALPNProto to NextProtos for tls-alpn-01, or use HTTPHandler | |||
// for http-01. (The tls-sni-* challenges have been deprecated by popular ACME providers | |||
// due to security issues in the ecosystem.) | |||
// also have to add acme.ALPNProto to NextProtos for tls-alpn-01, or use HTTPHandler for http-01. | |||
func (m *Manager) GetCertificate(hello *tls.ClientHelloInfo) (*tls.Certificate, error) { | |||
if m.Prompt == nil { | |||
return nil, errors.New("acme/autocert: Manager.Prompt not set") | |||
@@ -269,13 +265,10 @@ func (m *Manager) GetCertificate(hello *tls.ClientHelloInfo) (*tls.Certificate, | |||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute) | |||
defer cancel() | |||
// Check whether this is a token cert requested for TLS-SNI or TLS-ALPN challenge. | |||
// Check whether this is a token cert requested for TLS-ALPN challenge. | |||
if wantsTokenCert(hello) { | |||
m.tokensMu.RLock() | |||
defer m.tokensMu.RUnlock() | |||
// It's ok to use the same token cert key for both tls-sni and tls-alpn | |||
// because there's always at most 1 token cert per on-going domain authorization. | |||
// See m.verify for details. | |||
if cert := m.certTokens[name]; cert != nil { | |||
return cert, nil | |||
} | |||
@@ -318,8 +311,7 @@ func wantsTokenCert(hello *tls.ClientHelloInfo) bool { | |||
if len(hello.SupportedProtos) == 1 && hello.SupportedProtos[0] == acme.ALPNProto { | |||
return true | |||
} | |||
// tls-sni-xx | |||
return strings.HasSuffix(hello.ServerName, ".acme.invalid") | |||
return false | |||
} | |||
func supportsECDSA(hello *tls.ClientHelloInfo) bool { | |||
@@ -688,7 +680,7 @@ func (m *Manager) revokePendingAuthz(ctx context.Context, uri []string) { | |||
func (m *Manager) verify(ctx context.Context, client *acme.Client, domain string) error { | |||
// The list of challenge types we'll try to fulfill | |||
// in this specific order. | |||
challengeTypes := []string{"tls-alpn-01", "tls-sni-02", "tls-sni-01"} | |||
challengeTypes := []string{"tls-alpn-01"} | |||
m.tokensMu.RLock() | |||
if m.tryHTTP01 { | |||
challengeTypes = append(challengeTypes, "http-01") | |||
@@ -776,20 +768,6 @@ func (m *Manager) fulfill(ctx context.Context, client *acme.Client, chal *acme.C | |||
} | |||
m.putCertToken(ctx, domain, &cert) | |||
return func() { go m.deleteCertToken(domain) }, nil | |||
case "tls-sni-01": | |||
cert, name, err := client.TLSSNI01ChallengeCert(chal.Token) | |||
if err != nil { | |||
return nil, err | |||
} | |||
m.putCertToken(ctx, name, &cert) | |||
return func() { go m.deleteCertToken(name) }, nil | |||
case "tls-sni-02": | |||
cert, name, err := client.TLSSNI02ChallengeCert(chal.Token) | |||
if err != nil { | |||
return nil, err | |||
} | |||
m.putCertToken(ctx, name, &cert) | |||
return func() { go m.deleteCertToken(name) }, nil | |||
case "http-01": | |||
resp, err := client.HTTP01ChallengeResponse(chal.Token) | |||
if err != nil { |
@@ -156,7 +156,7 @@ func (c *Client) get(ctx context.Context, url string, ok resOkay) (*http.Respons | |||
} | |||
// post issues a signed POST request in JWS format using the provided key | |||
// to the specified URL. | |||
// to the specified URL. If key is nil, c.Key is used instead. | |||
// It returns a non-error value only when ok reports true. | |||
// | |||
// post retries unsuccessful attempts according to c.RetryBackoff | |||
@@ -193,14 +193,28 @@ func (c *Client) post(ctx context.Context, key crypto.Signer, url string, body i | |||
} | |||
// postNoRetry signs the body with the given key and POSTs it to the provided url. | |||
// The body argument must be JSON-serializable. | |||
// It is used by c.post to retry unsuccessful attempts. | |||
// The body argument must be JSON-serializable. | |||
// | |||
// If key argument is nil, c.Key is used to sign the request. | |||
// If key argument is nil and c.accountKID returns a non-zero keyID, | |||
// the request is sent in KID form. Otherwise, JWK form is used. | |||
// | |||
// In practice, when interfacing with RFC compliant CAs most requests are sent in KID form | |||
// and JWK is used only when KID is unavailable: new account endpoint and certificate | |||
// revocation requests authenticated by a cert key. | |||
// See jwsEncodeJSON for other details. | |||
func (c *Client) postNoRetry(ctx context.Context, key crypto.Signer, url string, body interface{}) (*http.Response, *http.Request, error) { | |||
kid := noKeyID | |||
if key == nil { | |||
key = c.Key | |||
kid = c.accountKID(ctx) | |||
} | |||
nonce, err := c.popNonce(ctx, url) | |||
if err != nil { | |||
return nil, nil, err | |||
} | |||
b, err := jwsEncodeJSON(body, key, nonce) | |||
b, err := jwsEncodeJSON(body, key, kid, nonce, url) | |||
if err != nil { | |||
return nil, nil, err | |||
} |
@@ -17,19 +17,38 @@ import ( | |||
"math/big" | |||
) | |||
// keyID is the account identity provided by a CA during registration. | |||
type keyID string | |||
// noKeyID indicates that jwsEncodeJSON should compute and use JWK instead of a KID. | |||
// See jwsEncodeJSON for details. | |||
const noKeyID = keyID("") | |||
// jwsEncodeJSON signs claimset using provided key and a nonce. | |||
// The result is serialized in JSON format. | |||
// The result is serialized in JSON format containing either kid or jwk | |||
// fields based on the provided keyID value. | |||
// | |||
// If kid is non-empty, its quoted value is inserted in the protected head | |||
// as "kid" field value. Otherwise, JWK is computed using jwkEncode and inserted | |||
// as "jwk" field value. The "jwk" and "kid" fields are mutually exclusive. | |||
// | |||
// See https://tools.ietf.org/html/rfc7515#section-7. | |||
func jwsEncodeJSON(claimset interface{}, key crypto.Signer, nonce string) ([]byte, error) { | |||
jwk, err := jwkEncode(key.Public()) | |||
if err != nil { | |||
return nil, err | |||
} | |||
func jwsEncodeJSON(claimset interface{}, key crypto.Signer, kid keyID, nonce, url string) ([]byte, error) { | |||
alg, sha := jwsHasher(key.Public()) | |||
if alg == "" || !sha.Available() { | |||
return nil, ErrUnsupportedKey | |||
} | |||
phead := fmt.Sprintf(`{"alg":%q,"jwk":%s,"nonce":%q}`, alg, jwk, nonce) | |||
var phead string | |||
switch kid { | |||
case noKeyID: | |||
jwk, err := jwkEncode(key.Public()) | |||
if err != nil { | |||
return nil, err | |||
} | |||
phead = fmt.Sprintf(`{"alg":%q,"jwk":%s,"nonce":%q,"url":%q}`, alg, jwk, nonce, url) | |||
default: | |||
phead = fmt.Sprintf(`{"alg":%q,"kid":%q,"nonce":%q,"url":%q}`, alg, kid, nonce, url) | |||
} | |||
phead = base64.RawURLEncoding.EncodeToString([]byte(phead)) | |||
cs, err := json.Marshal(claimset) | |||
if err != nil { |
@@ -0,0 +1,122 @@ | |||
// Copyright 2019 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. | |||
package acme | |||
import ( | |||
"context" | |||
"encoding/json" | |||
"fmt" | |||
"net/http" | |||
) | |||
// DeactivateReg permanently disables an existing account associated with c.Key. | |||
// A deactivated account can no longer request certificate issuance or access | |||
// resources related to the account, such as orders or authorizations. | |||
// | |||
// It works only with RFC8555 compliant CAs. | |||
func (c *Client) DeactivateReg(ctx context.Context) error { | |||
url := string(c.accountKID(ctx)) | |||
if url == "" { | |||
return ErrNoAccount | |||
} | |||
req := json.RawMessage(`{"status": "deactivated"}`) | |||
res, err := c.post(ctx, nil, url, req, wantStatus(http.StatusOK)) | |||
if err != nil { | |||
return err | |||
} | |||
res.Body.Close() | |||
return nil | |||
} | |||
// registerRFC is quivalent to c.Register but for RFC-compliant CAs. | |||
// It expects c.Discover to have already been called. | |||
// TODO: Implement externalAccountBinding. | |||
func (c *Client) registerRFC(ctx context.Context, acct *Account, prompt func(tosURL string) bool) (*Account, error) { | |||
c.cacheMu.Lock() // guard c.kid access | |||
defer c.cacheMu.Unlock() | |||
req := struct { | |||
TermsAgreed bool `json:"termsOfServiceAgreed,omitempty"` | |||
Contact []string `json:"contact,omitempty"` | |||
}{ | |||
Contact: acct.Contact, | |||
} | |||
if c.dir.Terms != "" { | |||
req.TermsAgreed = prompt(c.dir.Terms) | |||
} | |||
res, err := c.post(ctx, c.Key, c.dir.RegURL, req, wantStatus( | |||
http.StatusOK, // account with this key already registered | |||
http.StatusCreated, // new account created | |||
)) | |||
if err != nil { | |||
return nil, err | |||
} | |||
defer res.Body.Close() | |||
a, err := responseAccount(res) | |||
if err != nil { | |||
return nil, err | |||
} | |||
// Cache Account URL even if we return an error to the caller. | |||
// It is by all means a valid and usable "kid" value for future requests. | |||
c.kid = keyID(a.URI) | |||
if res.StatusCode == http.StatusOK { | |||
return nil, ErrAccountAlreadyExists | |||
} | |||
return a, nil | |||
} | |||
// updateGegRFC is equivalent to c.UpdateReg but for RFC-compliant CAs. | |||
// It expects c.Discover to have already been called. | |||
func (c *Client) updateRegRFC(ctx context.Context, a *Account) (*Account, error) { | |||
url := string(c.accountKID(ctx)) | |||
if url == "" { | |||
return nil, ErrNoAccount | |||
} | |||
req := struct { | |||
Contact []string `json:"contact,omitempty"` | |||
}{ | |||
Contact: a.Contact, | |||
} | |||
res, err := c.post(ctx, nil, url, req, wantStatus(http.StatusOK)) | |||
if err != nil { | |||
return nil, err | |||
} | |||
defer res.Body.Close() | |||
return responseAccount(res) | |||
} | |||
// getGegRFC is equivalent to c.GetReg but for RFC-compliant CAs. | |||
// It expects c.Discover to have already been called. | |||
func (c *Client) getRegRFC(ctx context.Context) (*Account, error) { | |||
req := json.RawMessage(`{"onlyReturnExisting": true}`) | |||
res, err := c.post(ctx, c.Key, c.dir.RegURL, req, wantStatus(http.StatusOK)) | |||
if e, ok := err.(*Error); ok && e.ProblemType == "urn:ietf:params:acme:error:accountDoesNotExist" { | |||
return nil, ErrNoAccount | |||
} | |||
if err != nil { | |||
return nil, err | |||
} | |||
defer res.Body.Close() | |||
return responseAccount(res) | |||
} | |||
func responseAccount(res *http.Response) (*Account, error) { | |||
var v struct { | |||
Status string | |||
Contact []string | |||
Orders string | |||
} | |||
if err := json.NewDecoder(res.Body).Decode(&v); err != nil { | |||
return nil, fmt.Errorf("acme: invalid response: %v", err) | |||
} | |||
return &Account{ | |||
URI: res.Header.Get("Location"), | |||
Status: v.Status, | |||
Contact: v.Contact, | |||
OrdersURL: v.Orders, | |||
}, nil | |||
} |
@@ -16,12 +16,13 @@ import ( | |||
// ACME server response statuses used to describe Authorization and Challenge states. | |||
const ( | |||
StatusUnknown = "unknown" | |||
StatusPending = "pending" | |||
StatusProcessing = "processing" | |||
StatusValid = "valid" | |||
StatusInvalid = "invalid" | |||
StatusRevoked = "revoked" | |||
StatusDeactivated = "deactivated" | |||
StatusInvalid = "invalid" | |||
StatusPending = "pending" | |||
StatusProcessing = "processing" | |||
StatusRevoked = "revoked" | |||
StatusUnknown = "unknown" | |||
StatusValid = "valid" | |||
) | |||
// CRLReasonCode identifies the reason for a certificate revocation. | |||
@@ -41,8 +42,17 @@ const ( | |||
CRLReasonAACompromise CRLReasonCode = 10 | |||
) | |||
// ErrUnsupportedKey is returned when an unsupported key type is encountered. | |||
var ErrUnsupportedKey = errors.New("acme: unknown key type; only RSA and ECDSA are supported") | |||
var ( | |||
// ErrUnsupportedKey is returned when an unsupported key type is encountered. | |||
ErrUnsupportedKey = errors.New("acme: unknown key type; only RSA and ECDSA are supported") | |||
// ErrAccountAlreadyExists indicates that the Client's key has already been registered | |||
// with the CA. It is returned by Register method. | |||
ErrAccountAlreadyExists = errors.New("acme: account already exists") | |||
// ErrNoAccount indicates that the Client's key has not been registered with the CA. | |||
ErrNoAccount = errors.New("acme: account does not exist") | |||
) | |||
// Error is an ACME error, defined in Problem Details for HTTP APIs doc | |||
// http://tools.ietf.org/html/draft-ietf-appsawg-http-problem. | |||
@@ -54,6 +64,12 @@ type Error struct { | |||
ProblemType string | |||
// Detail is a human-readable explanation specific to this occurrence of the problem. | |||
Detail string | |||
// Instance indicates a URL that the client should direct a human user to visit | |||
// in order for instructions on how to agree to the updated Terms of Service. | |||
// In such an event CA sets StatusCode to 403, ProblemType to | |||
// "urn:ietf:params:acme:error:userActionRequired" and a Link header with relation | |||
// "terms-of-service" containing the latest TOS URL. | |||
Instance string | |||
// Header is the original server error response headers. | |||
// It may be nil. | |||
Header http.Header | |||
@@ -108,49 +124,88 @@ func RateLimit(err error) (time.Duration, bool) { | |||
} | |||
// Account is a user account. It is associated with a private key. | |||
// Non-RFC8555 fields are empty when interfacing with a compliant CA. | |||
type Account struct { | |||
// URI is the account unique ID, which is also a URL used to retrieve | |||
// account data from the CA. | |||
// When interfacing with RFC8555-compliant CAs, URI is the "kid" field | |||
// value in JWS signed requests. | |||
URI string | |||
// Contact is a slice of contact info used during registration. | |||
// See https://tools.ietf.org/html/rfc8555#section-7.3 for supported | |||
// formats. | |||
Contact []string | |||
// Status indicates current account status as returned by the CA. | |||
// Possible values are "valid", "deactivated", and "revoked". | |||
Status string | |||
// OrdersURL is a URL from which a list of orders submitted by this account | |||
// can be fetched. | |||
OrdersURL string | |||
// The terms user has agreed to. | |||
// A value not matching CurrentTerms indicates that the user hasn't agreed | |||
// to the actual Terms of Service of the CA. | |||
// | |||
// It is non-RFC8555 compliant. Package users can store the ToS they agree to | |||
// during Client's Register call in the prompt callback function. | |||
AgreedTerms string | |||
// Actual terms of a CA. | |||
// | |||
// It is non-RFC8555 compliant. Use Directory's Terms field. | |||
// When a CA updates their terms and requires an account agreement, | |||
// a URL at which instructions to do so is available in Error's Instance field. | |||
CurrentTerms string | |||
// Authz is the authorization URL used to initiate a new authz flow. | |||
// | |||
// It is non-RFC8555 compliant. Use Directory's AuthzURL or OrderURL. | |||
Authz string | |||
// Authorizations is a URI from which a list of authorizations | |||
// granted to this account can be fetched via a GET request. | |||
// | |||
// It is non-RFC8555 compliant and is obsoleted by OrdersURL. | |||
Authorizations string | |||
// Certificates is a URI from which a list of certificates | |||
// issued for this account can be fetched via a GET request. | |||
// | |||
// It is non-RFC8555 compliant and is obsoleted by OrdersURL. | |||
Certificates string | |||
} | |||
// Directory is ACME server discovery data. | |||
// See https://tools.ietf.org/html/rfc8555#section-7.1.1 for more details. | |||
type Directory struct { | |||
// RegURL is an account endpoint URL, allowing for creating new | |||
// and modifying existing accounts. | |||
// NonceURL indicates an endpoint where to fetch fresh nonce values from. | |||
NonceURL string | |||
// RegURL is an account endpoint URL, allowing for creating new accounts. | |||
// Pre-RFC8555 CAs also allow modifying existing accounts at this URL. | |||
RegURL string | |||
// AuthzURL is used to initiate Identifier Authorization flow. | |||
// OrderURL is used to initiate the certificate issuance flow | |||
// as described in RFC8555. | |||
OrderURL string | |||
// AuthzURL is used to initiate identifier pre-authorization flow. | |||
// Empty string indicates the flow is unsupported by the CA. | |||
AuthzURL string | |||
// CertURL is a new certificate issuance endpoint URL. | |||
// It is non-RFC8555 compliant and is obsoleted by OrderURL. | |||
CertURL string | |||
// RevokeURL is used to initiate a certificate revocation flow. | |||
RevokeURL string | |||
// KeyChangeURL allows to perform account key rollover flow. | |||
KeyChangeURL string | |||
// Term is a URI identifying the current terms of service. | |||
Terms string | |||
@@ -162,6 +217,10 @@ type Directory struct { | |||
// recognises as referring to itself for the purposes of CAA record validation | |||
// as defined in RFC6844. | |||
CAA []string | |||
// ExternalAccountRequired indicates that the CA requires for all account-related | |||
// requests to include external account binding information. | |||
ExternalAccountRequired bool | |||
} | |||
// Challenge encodes a returned CA challenge. | |||
@@ -282,9 +341,10 @@ func (c *wireChallenge) challenge() *Challenge { | |||
// wireError is a subset of fields of the Problem Details object | |||
// as described in https://tools.ietf.org/html/rfc7807#section-3.1. | |||
type wireError struct { | |||
Status int | |||
Type string | |||
Detail string | |||
Status int | |||
Type string | |||
Detail string | |||
Instance string | |||
} | |||
func (e *wireError) error(h http.Header) *Error { | |||
@@ -292,6 +352,7 @@ func (e *wireError) error(h http.Header) *Error { | |||
StatusCode: e.Status, | |||
ProblemType: e.Type, | |||
Detail: e.Detail, | |||
Instance: e.Instance, | |||
Header: h, | |||
} | |||
} |
@@ -58,6 +58,14 @@ var serverForbiddenKexAlgos = map[string]struct{}{ | |||
kexAlgoDHGEXSHA256: {}, // server half implementation is only minimal to satisfy the automated tests | |||
} | |||
// preferredKexAlgos specifies the default preference for key-exchange algorithms | |||
// in preference order. | |||
var preferredKexAlgos = []string{ | |||
kexAlgoCurve25519SHA256, | |||
kexAlgoECDH256, kexAlgoECDH384, kexAlgoECDH521, | |||
kexAlgoDH14SHA1, | |||
} | |||
// supportedHostKeyAlgos specifies the supported host-key algorithms (i.e. methods | |||
// of authenticating servers) in preference order. | |||
var supportedHostKeyAlgos = []string{ | |||
@@ -246,7 +254,7 @@ func (c *Config) SetDefaults() { | |||
c.Ciphers = ciphers | |||
if c.KeyExchanges == nil { | |||
c.KeyExchanges = supportedKexAlgos | |||
c.KeyExchanges = preferredKexAlgos | |||
} | |||
if c.MACs == nil { |
@@ -32,7 +32,7 @@ func limitDial(network, addr string) (net.Conn, error) { | |||
// Dial with a timeout in case the API host is MIA. | |||
// The connection should normally be very fast. | |||
conn, err := net.DialTimeout(network, addr, 500*time.Millisecond) | |||
conn, err := net.DialTimeout(network, addr, 10*time.Second) | |||
if err != nil { | |||
limitRelease() | |||
return nil, err |
@@ -1,5 +1,4 @@ | |||
# cloud.google.com/go v0.45.0 | |||
cloud.google.com/go/civil | |||
cloud.google.com/go/compute/metadata | |||
# gitea.com/macaron/binding v0.0.0-20190822013154-a5f53841ed2b | |||
gitea.com/macaron/binding | |||
@@ -113,9 +112,10 @@ github.com/couchbase/vellum/utf8 | |||
github.com/couchbaselabs/go-couchbase | |||
# github.com/davecgh/go-spew v1.1.1 | |||
github.com/davecgh/go-spew/spew | |||
# github.com/denisenkom/go-mssqldb v0.0.0-20190820223206-44cdfe8d8ba9 | |||
# github.com/denisenkom/go-mssqldb v0.0.0-20190924004331-208c0a498538 | |||
github.com/denisenkom/go-mssqldb | |||
github.com/denisenkom/go-mssqldb/internal/cp | |||
github.com/denisenkom/go-mssqldb/internal/decimal | |||
github.com/denisenkom/go-mssqldb/internal/querytext | |||
# github.com/dgrijalva/jwt-go v3.2.0+incompatible | |||
github.com/dgrijalva/jwt-go | |||
@@ -213,6 +213,8 @@ github.com/gobwas/glob/util/strings | |||
github.com/gogits/chardet | |||
# github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14 | |||
github.com/gogs/cron | |||
# github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe | |||
github.com/golang-sql/civil | |||
# github.com/golang/protobuf v1.3.2 | |||
github.com/golang/protobuf/proto | |||
# github.com/golang/snappy v0.0.1 | |||
@@ -279,7 +281,7 @@ github.com/klauspost/crc32 | |||
github.com/kr/pretty | |||
# github.com/kr/text v0.1.0 | |||
github.com/kr/text | |||
# github.com/lafriks/xormstore v1.2.0 | |||
# github.com/lafriks/xormstore v1.3.0 | |||
github.com/lafriks/xormstore | |||
github.com/lafriks/xormstore/util | |||
# github.com/lib/pq v1.2.0 | |||
@@ -445,7 +447,7 @@ go.mongodb.org/mongo-driver/bson/bsonrw | |||
go.mongodb.org/mongo-driver/bson/bsontype | |||
go.mongodb.org/mongo-driver/bson/primitive | |||
go.mongodb.org/mongo-driver/x/bsonx/bsoncore | |||
# golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 | |||
# golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad | |||
golang.org/x/crypto/acme | |||
golang.org/x/crypto/acme/autocert | |||
golang.org/x/crypto/argon2 | |||
@@ -528,7 +530,7 @@ golang.org/x/tools/internal/gopathwalk | |||
golang.org/x/tools/internal/imports | |||
golang.org/x/tools/internal/module | |||
golang.org/x/tools/internal/semver | |||
# google.golang.org/appengine v1.6.2 | |||
# google.golang.org/appengine v1.6.4 | |||
google.golang.org/appengine | |||
google.golang.org/appengine/cloudsql | |||
google.golang.org/appengine/internal |