diff options
69 files changed, 1847 insertions, 558 deletions
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 22fab683..a0006d6f 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -14,6 +14,8 @@ jobs: - uses: actions/checkout@v2 - name: Run golangci-lint uses: actions-contrib/golangci-lint@v1 + with: + args: 'run --timeout=30m' test: name: Test diff --git a/conf/app.ini b/conf/app.ini index 97e59648..cb87e93c 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -146,6 +146,10 @@ PASSWORD = SSL_MODE = disable ; For "sqlite3" only, make sure to use absolute path. PATH = data/gogs.db +; The maximum open connections of the pool. +MAX_OPEN_CONNS = 30 +; The maximum idle connections of the pool. +MAX_IDLE_CONNS = 30 [security] ; Whether to show the install page, set this to "true" to bypass it. @@ -259,6 +263,10 @@ HOST = ; The value for "Access-Control-Allow-Origin" header, default is not to present. ACCESS_CONTROL_ALLOW_ORIGIN = +[lfs] +; The root path to store LFS objects. +OBJECTS_PATH = data/lfs-objects + [attachment] ; Whether to enabled upload attachments in general. ENABLED = true @@ -391,6 +399,16 @@ MAX_SIZE = 100 ; Maximum days to keep logger files MAX_DAYS = 3 +[log.gorm] +; Whether to enable file rotation. +ROTATE = true +; Whether to rotate file every day. +ROTATE_DAILY = true +; The maximum file size in MB before next rotate. +MAX_SIZE = 100 +; The maximum days to keep files. +MAX_DAYS = 3 + [cron] ; Enable running cron tasks periodically. ENABLED = true @@ -4,7 +4,7 @@ go 1.13 require ( github.com/bgentry/speakeasy v0.1.0 // indirect - github.com/denisenkom/go-mssqldb v0.0.0-20191001013358-cfbb681360f0 + github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e github.com/editorconfig/editorconfig-core-go/v2 v2.3.1 github.com/fatih/color v1.9.0 // indirect github.com/go-macaron/binding v1.1.0 @@ -13,6 +13,7 @@ require ( github.com/go-macaron/csrf v0.0.0-20190812063352-946f6d303a4c github.com/go-macaron/gzip v0.0.0-20160222043647-cad1c6580a07 github.com/go-macaron/i18n v0.5.0 + github.com/go-macaron/inject v0.0.0-20160627170012-d8a0b8677191 github.com/go-macaron/session v0.0.0-20190805070824-1a3cdc6f5659 github.com/go-macaron/toolbox v0.0.0-20190813233741-94defb8383c6 github.com/go-sql-driver/mysql v1.5.0 @@ -27,13 +28,14 @@ require ( github.com/google/go-querystring v1.0.0 // indirect github.com/issue9/identicon v1.0.1 github.com/jaytaylor/html2text v0.0.0-20190408195923-01ec452cbe43 + github.com/jinzhu/gorm v1.9.12 github.com/json-iterator/go v1.1.9 github.com/klauspost/compress v1.8.6 // indirect github.com/klauspost/cpuid v1.2.1 // indirect github.com/lib/pq v1.3.0 github.com/mattn/go-isatty v0.0.12 // indirect github.com/mattn/go-runewidth v0.0.4 // indirect - github.com/mattn/go-sqlite3 v1.13.0 + github.com/mattn/go-sqlite3 v2.0.3+incompatible github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2 github.com/microcosm-cc/bluemonday v1.0.2 github.com/msteinert/pam v0.0.0-20190215180659-f29b9f28d6f9 @@ -4,12 +4,6 @@ cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7h 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/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI= -github.com/alecthomas/chroma v0.7.1 h1:G1i02OhUbRi2nJxcNkwJaY/J1gHXj9tt72qN6ZouLFQ= -github.com/alecthomas/chroma v0.7.1/go.mod h1:gHw09mkX1Qp80JlYbmN9L3+4R5o6DJJ3GRShh+AICNc= -github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0= -github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI= -github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -19,16 +13,11 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= -github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668 h1:U/lr3Dgy4WK+hNk4tyD+nuGjpVLPEHuJSFXMw11/HPA= github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= -github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA= -github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= @@ -38,27 +27,20 @@ github.com/couchbaselabs/go-couchbase v0.0.0-20190708161019-23e7ca2ce2b7/go.mod github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGiisLwp9rITslkFNpZD5rz43tf41QFkTWY= -github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ= -github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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-20191001013358-cfbb681360f0 h1:epsH3lb7KVbXHYk7LYGN5EiE0MxcevHU85CKITJ0wUY= -github.com/denisenkom/go-mssqldb v0.0.0-20191001013358-cfbb681360f0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= -github.com/dlclark/regexp2 v1.1.6 h1:CqB4MjHw0MFCDj+PHHjiESmHX+N7t0tJzKvC6M97BRg= -github.com/dlclark/regexp2 v1.1.6/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= +github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= +github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e h1:LzwWXEScfcTu7vUZNlDDWDARoSGEtvlDKK2BYHowNeE= +github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e/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= -github.com/editorconfig/editorconfig-core-go/v2 v2.2.1 h1:jY5PCRQf4V0oqpim/Ympl6MwHcb9+nBHEnHOPXqNZ/A= -github.com/editorconfig/editorconfig-core-go/v2 v2.2.1/go.mod h1:6XDmqAZsQu8ikS+onLRJfLZvTP3RWTVT8ROX6qcdkio= -github.com/editorconfig/editorconfig-core-go/v2 v2.3.0 h1:QD1YB/rbntMEQIKM42kQOaqGdS13UvGsl9c8m/nFNWY= -github.com/editorconfig/editorconfig-core-go/v2 v2.3.0/go.mod h1:RNdPfKd9PliYEUZ3r+GxbDsSHNnEluC1wdkQJc3jD4k= github.com/editorconfig/editorconfig-core-go/v2 v2.3.1 h1:8+L7G4cCtuYprGaNawfTBq20m8+VpPCH2O0vwKS7r84= github.com/editorconfig/editorconfig-core-go/v2 v2.3.1/go.mod h1:mJYZ8yC2PWr+pabYXwHMfcEe45fh2w2sxk8cudJdLPM= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= +github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= @@ -67,8 +49,6 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-macaron/binding v1.0.1 h1:4LASxd4EKsESZ6ZMyzNVX+TM4Yuex4bTHYyz/PQjsRA= -github.com/go-macaron/binding v1.0.1/go.mod h1:AG8Z6qkQM8s47aUDJOco/SNwJ8Czif2hMm7rc0abDog= github.com/go-macaron/binding v1.1.0 h1:A5jpr5UdHr81Hfmb6QUAMTHyvniudOMcgtEg13TJ1ig= github.com/go-macaron/binding v1.1.0/go.mod h1:dJU/AtPKG0gUiFra1K5TTGduFGMNxMvfJzV/zmXwyGM= github.com/go-macaron/cache v0.0.0-20190810181446-10f7c57e2196 h1:fqWZxyMLF6RVGmjvsZ9FijiU9UlAjuE6nu9RfNBZ+iE= @@ -87,12 +67,10 @@ github.com/go-macaron/session v0.0.0-20190805070824-1a3cdc6f5659 h1:YXDFNK98PgKe github.com/go-macaron/session v0.0.0-20190805070824-1a3cdc6f5659/go.mod h1:tLd0QEudXocQckwcpCq5pCuTCuYc24I0bRJDuRe9OuQ= github.com/go-macaron/toolbox v0.0.0-20190813233741-94defb8383c6 h1:x/v1iUWlqXTKVg17ulB0qCgcM2s+eysAbr/dseKLLss= github.com/go-macaron/toolbox v0.0.0-20190813233741-94defb8383c6/go.mod h1:YFNJ/JT4yLnpuIXTFef30SZkxGHUczjGZGFaZpPcdn0= -github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= 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/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -100,25 +78,12 @@ github.com/gogs/chardet v0.0.0-20150115103509-2404f7772561 h1:aBzukfDxQlCTVS0NBU github.com/gogs/chardet v0.0.0-20150115103509-2404f7772561/go.mod h1:Pcatq5tYkCW2Q6yrR2VRHlbHpZ/R4/7qyL1TCF7vl14= 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/gogs/git-module v0.8.3 h1:9f8oxSs9OACWrGBYMVnnQNzyTcVN+zzcBM7CXnbmezw= -github.com/gogs/git-module v0.8.3/go.mod h1:aj4tcm7DxaszJWpZLZIRL6gfPXyguAHiE1PDfAAPrCw= -github.com/gogs/git-module v1.0.0-beta.4 h1:5CyCvTfrb2n5LRpHcNIaFnywHDkM/NxSZVP6t4tpTXI= -github.com/gogs/git-module v1.0.0-beta.4/go.mod h1:oN37FFStFjdnTJXsSbhIHKJXh2YeDsEcXPATVz/oeuQ= -github.com/gogs/git-module v1.0.0 h1:iOlCZ5kPc3RjnWRxdziL5hjCaosYyZw/Lf2odzR/kjw= -github.com/gogs/git-module v1.0.0/go.mod h1:oN37FFStFjdnTJXsSbhIHKJXh2YeDsEcXPATVz/oeuQ= -github.com/gogs/git-module v1.0.1 h1:Xh/sfk6zKjF3y9w2G/dN0YMfLjMhRQzqxMTUPHOL5n4= -github.com/gogs/git-module v1.0.1/go.mod h1:oN37FFStFjdnTJXsSbhIHKJXh2YeDsEcXPATVz/oeuQ= -github.com/gogs/git-module v1.0.2 h1:YrDZV4g489A4sOF3+gQq85UnVBjLn30+w3PF5PBoGpQ= -github.com/gogs/git-module v1.0.2/go.mod h1:oN37FFStFjdnTJXsSbhIHKJXh2YeDsEcXPATVz/oeuQ= -github.com/gogs/git-module v1.1.0 h1:OEQAWvhZ4TCsq6Vw/ftyA37Os1QkiPu1uMQpF6ErzG0= -github.com/gogs/git-module v1.1.0/go.mod h1:oN37FFStFjdnTJXsSbhIHKJXh2YeDsEcXPATVz/oeuQ= github.com/gogs/git-module v1.1.1 h1:/taoHtOHLorlmQJ7zLBQvJGGgM9LRIoGGH1et4Upzvo= github.com/gogs/git-module v1.1.1/go.mod h1:oN37FFStFjdnTJXsSbhIHKJXh2YeDsEcXPATVz/oeuQ= github.com/gogs/go-gogs-client v0.0.0-20200128182646-c69cb7680fd4 h1:C7NryI/RQhsIWwC2bHN601P1wJKeuQ6U/UCOYTn3Cic= github.com/gogs/go-gogs-client v0.0.0-20200128182646-c69cb7680fd4/go.mod h1:fR6z1Ie6rtF7kl/vBYMfgD5/G5B1blui7z426/sj2DU= github.com/gogs/go-libravatar v0.0.0-20191106065024-33a75213d0a0 h1:K02vod+sn3M1OOkdqi2tPxN2+xESK4qyITVQ3JkGEv4= github.com/gogs/go-libravatar v0.0.0-20191106065024-33a75213d0a0/go.mod h1:Zas3BtO88pk1cwUfEYlvnl/CRwh0ybDxRWSwRjG8I3w= -github.com/gogs/minwinsvc v0.0.0-20170301035411-95be6356811a h1:8DZwxETOVWIinYxDK+i6L+rMb7eGATGaakD6ZucfHVk= github.com/gogs/minwinsvc v0.0.0-20170301035411-95be6356811a/go.mod h1:TUIZ+29jodWQ8Gk6Pvtg4E09aMsc3C/VLZiVYfUhWQU= 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= @@ -133,10 +98,7 @@ github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8l github.com/golang/snappy v0.0.1/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-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= @@ -148,26 +110,26 @@ github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OI github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c h1:7lF+Vz0LqiRidnzC1Oq86fpX1q/iEv2KJdrCtttYjT4= github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= 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/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/issue9/assert v1.3.1 h1:L8pRpbnzMIPFJqrMKR/oG03uWrtVeZyYBpI2U2Jx1JE= github.com/issue9/assert v1.3.1/go.mod h1:9Ger+iz8X7r1zMYYwEhh++2wMGWcNN2oVI+zIQXxcio= github.com/issue9/identicon v1.0.1 h1:pCDfjMDM6xWK0Chxo8Lif+ST/nOEtmXgMITgV1YA9Og= github.com/issue9/identicon v1.0.1/go.mod h1:UKNVkUFI68RPz/RlLhsAr1aX6bBSaYEWRHVfdjrMUmk= github.com/jaytaylor/html2text v0.0.0-20190408195923-01ec452cbe43 h1:jTkyeF7NZ5oIr0ESmcrpiDgAfoidCBF4F5kJhjtaRwE= github.com/jaytaylor/html2text v0.0.0-20190408195923-01ec452cbe43/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk= +github.com/jinzhu/gorm v1.9.12 h1:Drgk1clyWT9t9ERbzHza6Mj/8FY/CqMyVzOiHviMo6Q= +github.com/jinzhu/gorm v1.9.12/go.mod h1:vhTjlKSJUTWNtcbQtrMBFCxy7eXTzeCAzfL5fBZT/Qs= +github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo= -github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= 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= @@ -177,24 +139,19 @@ github.com/klauspost/cpuid v1.2.1 h1:vJi+O/nMdFt0vqm8NZBI6wzALWdA2X+egi0ogNyrC/w github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= 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/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -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/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.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU= github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lunny/log v0.0.0-20160921050905-7887c61bf0de/go.mod h1:3q8WtuPQsoRbatJuy3nvq/hRSvuBJrHHr+ybPPiNvHQ= github.com/lunny/nodb v0.0.0-20160621015157-fc1ef06ad4af/go.mod h1:Cqz6pqow14VObJ7peltM+2n3PWOz7yTrfUuGbVFkzN0= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.10 h1:qxFzApOv4WsAL965uUPIsXzAKCZxN2p9UqdhFS4ZW10= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= @@ -202,10 +159,10 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-sqlite3 v1.11.0 h1:LDdKkqtYlom37fkvqs8rMPFKAMe8+SgjbwZ6ex1/A/Q= github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-sqlite3 v1.13.0 h1:LnJI81JidiW9r7pS/hXe6cFeO5EXNq7KbfvoJLRI69c= -github.com/mattn/go-sqlite3 v1.13.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= +github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mcuadros/go-version v0.0.0-20190308113854-92cdf37c5b75/go.mod h1:76rfSfYPWj01Z85hUf/ituArm797mNKcvINh1OlsZKo= @@ -213,20 +170,16 @@ github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2 h1:YocNLcTBdEd github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2/go.mod h1:76rfSfYPWj01Z85hUf/ituArm797mNKcvINh1OlsZKo= github.com/microcosm-cc/bluemonday v1.0.2 h1:5lPfLTTAvAbtS0VqT+94yOtFnGfUWYyx0+iToC3Os3s= github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/msteinert/pam v0.0.0-20190215180659-f29b9f28d6f9 h1:ZivaaKmjs9q90zi6I4gTLW6tbVGtlBjellr3hMYaly0= github.com/msteinert/pam v0.0.0-20190215180659-f29b9f28d6f9/go.mod h1:np1wUFZ6tyoke22qDJZY40URn9Ae51gX7ljIWXN5TJs= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= -github.com/niklasfasching/go-org v0.1.6 h1:F521WcqRNl8OJumlgAnekZgERaTA2HpfOYYfVEKOeI8= -github.com/niklasfasching/go-org v0.1.6/go.mod h1:AsLD6X7djzRIz4/RFZu8vwRL0VGjUvGZCCH1Nz0VdrU= github.com/niklasfasching/go-org v0.1.9 h1:Toz8WMIt+qJb52uYEk1YD/muLuOOmRt1CfkV+bKVMkI= github.com/niklasfasching/go-org v0.1.9/go.mod h1:AsLD6X7djzRIz4/RFZu8vwRL0VGjUvGZCCH1Nz0VdrU= github.com/olekukonko/tablewriter v0.0.1 h1:b3iUnf1v+ppJiOfNX4yxxqfWKMQPZR5yoh8urCTFX88= @@ -240,7 +193,6 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo= 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/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -251,28 +203,20 @@ github.com/pquerna/otp v1.2.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1 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_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.2.1 h1:JnMpQc6ppsNgw9QPAGF6Dod479itz7lvlsMzzNayLOI= -github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U= github.com/prometheus/client_golang v1.5.1 h1:bdHYieyGlH+6OLEk2YQha8THib30KP0/yD0YH9m6xcA= github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= 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/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLyCY= -github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= github.com/prometheus/common v0.9.1 h1:KOMtN28tlbam3/7ZKEYKHhKoJZYYj3gMH4uc62x7X7U= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= 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/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8= -github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= @@ -280,12 +224,9 @@ github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNue github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca h1:NugYot0LIVPxTvN8n+Kvkn6TrbMyxQiuvKdEwFdR9vI= github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca/go.mod h1:uugorj2VCxiV1x+LzaIdVa9b4S4qGAcH6cbhh4qVxOU= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= @@ -298,20 +239,16 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w= github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 h1:WN9BUFbdyOsSH/XohnWpXOlq9NBD5sGAB2FciQMUEe8= github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo= github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= 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/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= @@ -325,13 +262,8 @@ github.com/unknwon/i18n v0.0.0-20190805065654-5c6446a380b6 h1:sRrkJEHtNoaSvyXMbR github.com/unknwon/i18n v0.0.0-20190805065654-5c6446a380b6/go.mod h1:+5rDk6sDGpl3azws3O+f+GpFSyN9GVr0K8cvQLQM2ZQ= github.com/unknwon/paginater v0.0.0-20170405233947-45e5d631308e h1:Qf3QQl/zmEbWDajFEiisbKN83hLY+eq2MhbA0I1/two= github.com/unknwon/paginater v0.0.0-20170405233947-45e5d631308e/go.mod h1:TBwoao3Q4Eb/cp+dHbXDfRTrZSsj/k7kLr2j1oWRWC0= -github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY= -github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli v1.22.3 h1:FpNT6zq26xNpHZy08emi755QwzLPs6Pukqjlc7RfOMU= -github.com/urfave/cli v1.22.3/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA= github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -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= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -340,8 +272,7 @@ golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6 h1:Sy5bstxEqwwbYs6n0/pBuxKENqOeZUgD45Gp3Q3pqLg= -golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 h1:/Tl7pH94bvbAAHBdZJT947M/+gp0+CqQXDtMRC0fseo= golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -379,7 +310,6 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/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-20181128092732-4ed8d59d0b35/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-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -387,8 +317,6 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY= -golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -416,7 +344,6 @@ google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMt google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.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/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -424,33 +351,23 @@ google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRn 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/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/bufio.v1 v1.0.0-20140618132640-567b2bfa514e h1:wGA78yza6bu/mWcc4QfBuIEHEtc06xdiU0X8sY36yUU= gopkg.in/bufio.v1 v1.0.0-20140618132640-567b2bfa514e/go.mod h1:xsQCaysVCudhrYTfzYWe577fCe7Ceci+6qjO2Rdc0Z4= 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/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE= gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw= -gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.46.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.52.0 h1:j+Lt/M1oPPejkniCg1TkWE2J3Eh1oZTsHSXzMTzUXn4= -gopkg.in/ini.v1 v1.52.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.53.0 h1:c7ruDvTQi0MUTFuNpDRXLSjs7xT4TerM1icIg4uKWRg= -gopkg.in/ini.v1 v1.53.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.54.0 h1:oM5ElzbIi7gwLnNbPX2M25ED1vSAK3B6dex50eS/6Fs= gopkg.in/ini.v1 v1.54.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.55.0 h1:E8yzL5unfpW3M6fz/eB7Cb5MQAYSZ7GKo4Qth+N2sgQ= gopkg.in/ini.v1 v1.55.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ldap.v2 v2.5.1 h1:wiu0okdNfjlBzg6UWvd1Hn8Y+Ux17/u/4nlk4CQr6tU= gopkg.in/ldap.v2 v2.5.1/go.mod h1:oI0cpe/D7HRtBQl8aTg+ZmzFUAvu4lsv3eLXMLGFxWk= -gopkg.in/macaron.v1 v1.3.4 h1:HvIscOwxhFhx3swWM/979wh2QMYyuXrNmrF9l+j3HZs= gopkg.in/macaron.v1 v1.3.4/go.mod h1:/RoHTdC8ALpyJ3+QR36mKjwnT1F1dyYtsGM9Ate6ZFI= gopkg.in/macaron.v1 v1.3.5 h1:FUA16VFBojxzfU75KqWrV/6BPv9O2R1GnybSGRie9QQ= gopkg.in/macaron.v1 v1.3.5/go.mod h1:uMZCFccv9yr5TipIalVOyAyZQuOH3OkmXvgcWwhJuP4= @@ -458,19 +375,13 @@ gopkg.in/redis.v2 v2.3.2 h1:GPVIIB/JnL1wvfULefy3qXmPu1nfNu2d0yA09FHgwfs= gopkg.in/redis.v2 v2.3.2/go.mod h1:4wl9PJ/CqzeHk3LVq1hNLHH8krm3+AXEgut4jVc++LU= 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 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo= -gopkg.in/yaml.v2 v2.2.7/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= -unknwon.dev/clog/v2 v2.1.0 h1:4iXteBnL9ESvxoNkiaWx4UTU6yEgEmDxFaMANyiq4b8= -unknwon.dev/clog/v2 v2.1.0/go.mod h1:zvUlyibDHI4mykYdWyWje2G9nF/nBzfDOqRo2my4mWc= -unknwon.dev/clog/v2 v2.1.1 h1:jBmBoMfsedJ/Sirm4/TdDy00mxh1vlbr9dM+AnYsNik= -unknwon.dev/clog/v2 v2.1.1/go.mod h1:zvUlyibDHI4mykYdWyWje2G9nF/nBzfDOqRo2my4mWc= unknwon.dev/clog/v2 v2.1.2 h1:+jwPPp10UtOPunFtviUmXF01Abf6q7p5GEy4jluLl8o= unknwon.dev/clog/v2 v2.1.2/go.mod h1:zvUlyibDHI4mykYdWyWje2G9nF/nBzfDOqRo2my4mWc= xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8= diff --git a/internal/assets/conf/conf_gen.go b/internal/assets/conf/conf_gen.go index e0c5bec6..3f502796 100644 --- a/internal/assets/conf/conf_gen.go +++ b/internal/assets/conf/conf_gen.go @@ -1,6 +1,6 @@ // Code generated by go-bindata. DO NOT EDIT. // sources: -// ../../../conf/app.ini (18.756kB) +// ../../../conf/app.ini (19.19kB) // ../../../conf/auth.d/github.conf.example (181B) // ../../../conf/auth.d/ldap_bind_dn.conf.example (719B) // ../../../conf/auth.d/ldap_simple_auth.conf.example (761B) @@ -309,7 +309,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _confAppIni = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7c\xdd\x8f\xe4\xca\x75\xdf\x3b\xff\x8a\xba\x2d\x2b\xda\x15\xd8\x3d\x1f\xbb\xb3\x77\xef\x8e\xda\x10\xb7\x9b\x33\x43\x6f\x7f\x89\xe4\xec\xc7\x1d\x2c\xb8\x35\x64\x35\xbb\xd4\x24\x8b\xaa\x2a\xce\x6c\x0b\x81\xa1\x0b\x3f\x38\x09\xe2\xa7\x24\x36\x02\x18\x01\x8c\x20\x31\xe0\xc4\x89\x8c\x24\x80\xac\xc8\xc8\xc3\xb5\xdf\x77\xff\x07\x43\xb2\x83\x04\xfe\x17\x82\x73\x8a\xec\x66\xcf\xf4\xcc\x5d\xcb\x08\x7c\x2f\x30\xcd\x26\x8b\xa7\x4e\x55\x9d\x8f\xdf\xf9\xe8\xfd\x16\xf9\xec\xb3\xcf\xc8\xc4\x7d\xe9\xfa\x04\xff\x8c\xa7\x43\xef\xe4\x0d\x09\xcf\xbc\x80\x9c\x78\x23\x17\x9e\x5b\x66\xd4\x6c\xe4\x3a\x81\x4b\xc6\xce\x0b\x97\x0c\xce\x9c\xc9\xa9\x1b\x90\xe9\x84\x0c\xa6\xbe\xef\x06\xb3\xe9\x64\xe8\x4d\x4e\xc9\xe0\x3c\x08\xa7\x63\x32\x98\x4e\x4e\xbc\xd3\x9b\x14\xbc\x13\xf2\x66\x7a\x4e\x1c\xdf\x25\x33\x67\xf0\xc2\x39\x85\x37\x66\xfe\xf4\xa5\x37\x74\x7d\x7b\x6b\x82\xe9\x2b\xa0\x3c\x7b\x43\xa6\x27\xc4\x0b\x91\x86\x75\x4c\xc2\x05\x23\x97\x92\x16\x09\x29\x68\xce\x88\x98\x13\xbd\x60\x84\x96\x65\xc6\x63\xaa\xb9\x28\x6c\x12\xd3\x82\x5c\x32\xb2\x12\x95\x24\xb1\xc8\x4b\x5a\xac\x88\x90\x44\x33\x9a\xe3\x4b\x3d\xeb\xb9\xef\x4c\x86\xd1\xc4\x19\xbb\xa4\x4f\x4e\x45\xaa\x6a\xc2\x6a\xa5\x34\xcb\x49\xa5\x98\x24\xd7\x0b\x41\xd4\x42\x54\x59\x02\xc4\x64\x55\x14\xbc\x48\x6f\x4e\xa6\x7a\xc4\xd3\x64\x41\x15\x29\x04\x61\xf3\x39\x8b\x35\x11\x05\x79\xc5\x8b\x44\x5c\x2b\xdb\x3a\x26\x42\x2f\x98\xbc\xe6\x8a\xd9\x84\xeb\x86\x60\x4e\x75\xbc\x40\x5a\x57\x34\xab\x70\x15\xbf\x71\x1e\xb8\x3e\x61\xc5\x15\x97\xa2\xc8\x59\xa1\xc9\x15\x95\x9c\x5e\x66\xac\x67\xf9\xe7\x93\x08\x1f\xf7\x49\xca\x75\xcd\x6b\xc3\x51\x2e\x92\x7b\xb7\x81\x71\xe0\x80\x74\x12\x76\xd5\xb1\x49\xa7\x94\x22\xe9\xc0\x76\x74\x34\x53\xba\x63\x88\x8f\xa7\x43\xd8\x89\x84\x5d\x59\xd6\x85\x62\xf2\x8a\xc9\xb7\xf5\x34\x65\x75\x99\xf1\xb8\x3b\xa7\x31\x4c\x76\xee\x8f\xc8\x1c\xf6\x72\x7b\xb2\x9e\xe5\xbe\x0e\x5d\x7f\xe2\x8c\x22\x18\xd1\x27\xdf\x7e\x30\xf3\xa7\xe1\x74\x30\x1d\x3d\x54\xcf\xf6\xf6\xbe\xfd\x60\x38\x1d\x3b\xde\xe4\xa1\x7a\xf6\xed\x07\x67\x61\x38\x8b\x66\x53\x3f\x7c\xa8\xf6\x76\x4e\x92\x88\x9c\xf2\xc2\x9c\xef\xce\xc9\x0c\x31\xd2\x27\x99\x88\x69\xb6\x10\xaa\xd9\x93\x52\x0a\x2d\x62\x91\x11\xbd\xa0\x9a\x70\x05\x27\x99\x10\x2d\x08\xae\x89\x24\x5c\xc2\x01\x69\x49\xe7\x73\x1e\xc3\xfd\x5b\xa4\x8f\xc9\xa0\x92\x92\x15\x3a\x5b\x11\x55\x95\xa5\x90\x5a\x91\xce\x42\xeb\x12\x36\x0f\x3e\x15\x5c\xcc\xe3\x94\x77\x08\x48\x61\xa7\x2a\xf8\xfb\x4e\xcf\x6a\xd6\x4b\xfa\x04\x46\xd5\x0c\xd1\x24\x91\x4c\x29\x98\xea\x92\x91\x8c\x2b\xcd\x0a\x96\x90\xcb\xd5\xed\x99\x71\x5b\x9c\xe1\x10\x4e\x79\xbf\x87\xff\x37\xab\x12\x52\x93\xa2\xca\x2f\x99\xfc\x64\x42\xb0\xbf\xa4\x4f\x1e\xed\xef\x03\x95\x53\x56\x30\x49\x35\x23\x4a\xb3\x52\x3d\xb3\x8e\xc9\x6f\x90\xde\x5e\x2a\x52\x45\x62\x26\x35\xe9\xc6\xb4\xaf\x65\xc5\x48\x37\xa9\x24\x92\xe9\x3f\xfd\xfc\xc9\xfe\x62\x3f\xdf\x57\xa4\x0b\x1b\xdc\xcf\x57\xf0\xd1\x63\xef\x69\x5e\x66\xac\x17\x8b\xdc\x3a\xb6\x8e\xc9\x54\x92\xb9\x14\x39\xa1\xa4\x57\xce\xdf\x93\x39\xcf\x18\x61\xef\x81\x63\x96\x98\x27\xc0\x5f\xad\x0f\x38\x19\x9f\x03\xa7\xc0\x8a\x90\x8c\x3c\x48\x84\x75\x4c\x0a\xa1\xe1\xa4\x53\xa6\x61\x81\xe6\x7d\x7c\xb1\x94\xfc\x0a\x06\x2f\xd9\xea\xa1\x61\x5b\x94\xac\x50\x2a\x23\xe5\x32\x56\x07\x87\xa4\xcb\x0b\xa4\x8a\xb3\x77\x45\xa5\xeb\x6f\x2c\x27\xdd\x42\x2c\xd9\x4a\x7d\xda\x5b\x4b\xb6\x6a\x5e\x82\x07\x0a\x2e\x12\xa6\xac\x81\xeb\x87\x11\xda\xb0\x3e\x89\x2b\xa5\x45\xbe\x87\x42\xb0\xd7\x4c\x63\xbd\x70\xdf\xec\x1c\x50\x53\xac\xcf\x30\xe7\x05\xcf\xab\x9c\xd0\x2c\x13\xd7\x2c\x21\xe1\x28\x20\x57\x4c\x2a\xa3\xa9\x3b\x44\x2e\x1c\x05\x07\xfb\x20\x6a\x70\x71\xd0\x5c\x1c\x76\x6c\x23\x75\xf0\xe5\x51\xa7\x67\x85\xa3\x20\x1a\x7b\x93\xe8\xa5\xeb\x07\xde\x14\x74\x02\x87\x59\xc7\xe4\x04\x8e\xa2\x64\x32\xe7\x0a\x66\x21\xd7\x0b\x56\xd4\x7a\xd0\x28\xc0\x15\xa7\xe4\xbc\xe0\xef\x1b\x8d\x53\x22\x5e\x32\xdd\xb3\xce\x27\xde\xeb\x28\x98\x0e\x5e\xb8\x61\x34\x73\xfd\xb1\x17\xd4\xb4\x9f\x3c\x79\x62\x1d\x93\x11\x68\x1d\x79\x30\x1c\x7f\xf9\x70\x6d\x10\xae\x85\x5c\x32\xa9\xc8\x03\xd6\x4b\x7b\x24\x08\xce\x48\x55\x26\x54\xb3\x87\x84\xc6\x31\x53\x0a\xf4\xfa\x9a\x5d\x22\x03\x3c\x66\xa0\x68\x5e\x41\x72\xa1\x34\x89\xa9\x62\x0a\xac\x35\x49\x04\x4a\x42\xc1\x8c\xd2\xc6\x0b\x5a\xa4\x0c\xe5\x20\x61\x73\x5a\x65\xda\x98\x4b\x78\xd9\xc9\x34\x93\x60\x51\x45\x91\xad\x08\x9f\x1b\x6b\x0f\xf3\x1a\xf3\x45\xe0\xf8\xc0\x02\x00\x41\xa0\xa0\xc0\x9a\x50\x45\x40\x3b\xf0\x61\xcf\x1a\x4d\x07\xce\x28\xf2\xa7\xd3\xf0\x2e\xab\xb5\xd6\xc9\xdb\x86\xcb\x3a\x26\xaf\x16\x0c\x4d\xab\x16\x24\xe1\x0a\x4c\x35\xa9\x70\xa1\x83\xe1\x04\x37\x45\x69\xaa\x79\x8c\x4a\xa1\x88\x64\x29\x95\x49\xc6\x94\xea\x59\xd3\x93\x93\x91\x37\x71\x1b\xbb\x3b\xa7\x99\x62\xbb\x09\x66\x22\x4d\x81\x24\x2f\x88\x14\x95\x66\xb2\x67\x0d\xbd\xc0\x79\x3e\x72\x23\x7f\x7a\x1e\xba\x7e\x34\x9a\x9e\x92\x3e\x01\xed\xdd\xa6\xc0\x0a\x24\xd0\x32\x0d\x24\x63\x57\x2c\x23\xa7\x5f\x7a\x33\xf4\x8b\x60\x99\x8c\xf1\x9e\x20\x41\x7c\xd0\x70\xd3\xd8\x1e\xaa\x17\xf5\x5a\x84\x04\x46\xda\xf4\x54\xc9\x62\x50\x67\x92\x50\x4d\x7b\x96\x33\x9b\x45\x43\x27\x74\xa2\x99\x13\x9e\x81\x3b\xa1\x9a\xee\xe4\x49\x0b\x92\x09\x9a\x10\xaa\x14\xd3\x8a\x3c\xe0\x3d\xd6\x23\x9d\x58\x14\x73\x90\x73\xcd\xf2\x32\xa3\x9a\xa1\xa1\x35\x9e\xa1\xf3\xd0\xd8\x92\x84\xab\x25\xe1\x85\xd2\x8c\x26\xe0\xf3\x58\x7e\xc9\x92\x04\xec\x20\x2f\x0c\x0f\xa3\xa9\x33\x8c\x9c\x20\x70\xc3\x20\x3a\xf1\xa7\xe3\x68\xe8\x05\x2f\x6e\x2e\x2a\xa3\x45\x02\x6b\x29\x69\xca\xd6\x12\x4c\x0b\x51\xac\x72\x51\xa1\xd3\x90\xca\x6e\xb9\xe7\xda\x6b\x83\x28\xf1\x22\xce\xaa\x04\xb6\x5a\x55\x97\xb8\x39\x8d\xab\x59\xd0\x22\xc9\x36\x26\x59\x32\x50\x6f\x74\x49\xef\x57\x3d\x6b\xe4\x20\x38\xaa\x05\xed\x2e\xf1\x01\xf9\x35\xfa\xb2\xc3\x39\x11\x56\x68\x2e\x59\xb6\xda\x88\x00\x8c\xdf\x88\x0f\x2c\xad\xed\x3b\x8d\xaf\x00\x6b\x0a\x5e\x90\x17\x48\x3e\xce\x44\x81\x8b\xee\x59\x41\x70\x16\xad\x5d\xe9\xc6\x45\xdf\xe9\x75\xee\xa7\x54\x7b\x9c\xc3\xc3\xb6\xe4\x88\x39\x0e\x95\x42\xe8\xda\xfb\x0a\xb9\xb2\xd7\xea\xcc\x15\xe9\xfc\xc6\xd9\x74\xec\xee\xf5\x94\x5a\x74\x0c\x21\x54\x48\x23\x42\x6d\x52\xe0\xc5\xd5\xa2\xbb\x64\xab\x94\x15\xdb\x24\x36\xf7\x8d\x4f\xce\x18\x20\x2d\x96\x65\x64\xce\x8b\x84\x80\x7d\xbf\x5e\xf0\x78\x41\x80\x61\x30\x2c\x34\xcb\xcc\x5c\x2f\xdc\x37\xa7\xee\xa4\x11\xd8\x0d\x9d\x66\x37\x1b\x96\xf1\x2d\xc9\xc0\x15\x81\x78\x0a\x49\xe5\xaa\xd6\x6b\xb4\xab\x80\xa5\x08\xad\x71\x0c\x38\x93\xda\x12\xb4\x38\xb6\x8e\xdb\x3c\xeb\x0d\xda\xdc\x10\x5c\x4f\xb7\x66\x2e\x0a\xdd\xa0\xb5\x19\x2d\x91\x89\x17\x2c\x5e\xae\xdd\x4a\x6b\x62\xc5\x7f\xcc\xc8\x35\xd7\x0b\x12\x0b\x29\x99\x2a\x85\x11\x76\xbd\x2a\x59\xcf\x1a\x7b\x13\x6f\x7c\x3e\x46\xda\x81\xf7\xa5\x1b\x0d\xce\xdc\xc1\x8b\xdd\x36\x48\xb2\x6b\xc9\x35\x23\x9d\xdf\xc6\xe3\xd9\xa3\x95\x5e\x08\xc9\x7f\xcc\x92\x08\x1c\x6b\xc7\x78\x7b\xaa\xc1\xce\x49\x6d\x13\x9e\x16\x42\xb2\xc4\xec\x48\xa5\x18\xb9\xac\x78\xa6\x6b\x69\x31\x66\xb9\x67\xf9\xee\x2b\xdf\x0b\xdd\xc8\x39\x0f\xcf\xa6\xbe\xf7\xa5\x3b\x04\x5e\x82\xc8\x09\xa3\x20\x74\x50\x84\x76\xb0\x82\x33\x10\xba\x93\x22\xbe\x06\xaa\x10\x05\xae\xff\x12\x51\x72\x5b\x23\x0a\xa6\xc1\x39\x11\x5e\x68\x26\xe7\x34\x36\x98\xf2\x36\x21\xb4\x4a\x88\xab\x08\xd8\x44\xa0\x37\xf2\x82\xd0\x9d\x44\x67\xd3\x20\xbc\x17\x94\xfd\x7d\x09\xd6\xaa\xf2\xed\x07\x8d\xde\xac\x95\x0e\xc6\x83\xd2\x80\x11\x28\x01\x42\xc5\xbc\x5c\x80\x5f\x85\x29\x62\x51\x14\x2c\xc6\xb0\x03\x35\x72\xd7\x5e\xac\x77\x21\x1a\x78\xb3\x33\xd7\x0f\x48\x9f\x50\xa6\x0e\x0e\x9f\x76\x63\x2d\x6d\xbc\xfe\xe2\x70\x7d\x7d\x78\xf4\x64\x73\xff\xf0\x69\x37\x8d\xf3\xef\x1b\xac\xb4\x00\x88\x67\x13\x2a\xe3\xb9\xa8\xe4\xe1\xd1\x93\xf5\xf5\xc1\xe1\x53\x30\x5f\x43\x36\xe7\x05\x5b\x03\x1a\x9a\xa5\x42\x72\xbd\xc8\x15\xaa\xa0\x5e\x30\x2e\xd7\xe2\x09\x72\x99\xb1\x22\xd5\x0b\xf2\x00\x04\xa3\x7b\xd0\xb6\x7a\x14\x65\xf3\x61\xcf\xba\x80\x69\xeb\x77\x40\xc4\x22\x90\x65\xf5\xd6\x72\x87\x87\x47\x47\x07\x5f\x80\x75\x39\x7a\x62\xb9\x83\x61\xe0\x10\x52\x7f\xf3\xf1\x1a\xbf\xed\x3f\x7e\x6a\x0d\xd7\x5f\x0f\xf6\x0f\x1f\x5b\xd6\x85\x64\xa5\x50\x1c\x94\xaa\x89\x68\xd0\x18\xdd\xf2\x6b\x39\x2d\x68\xca\x12\xb2\x1e\xcf\x99\xda\xb6\x32\xbf\x8d\x80\xb9\xdb\x1e\xd0\xb1\xc0\x58\xad\xed\x94\x8a\x25\x2f\x35\xae\xa6\x91\x81\x06\xd0\xd9\x44\x89\x9c\x69\x9e\x33\x45\xe2\x26\xa8\xec\x18\x9b\x37\xf0\xbd\x59\x18\x85\x6f\x66\x80\x05\x2e\xa9\x5a\x98\xdd\xc5\x89\x9d\x49\xe0\x01\x10\x92\x8a\xe9\xda\x4d\x91\xaa\x90\x2c\x16\x69\x01\x9a\xd8\x3c\xeb\x59\x30\x32\x1a\x9c\x39\x7e\xe0\x86\x37\x8d\xc5\x5c\xc8\x98\x11\xf0\x48\x2b\x52\xb0\xeb\xcd\x22\x57\xb5\x69\xaf\x71\x76\xcf\x3a\x99\xfa\x03\x37\x9a\xf9\xde\x4b\x27\x74\x6f\x68\x52\x9a\x89\x4b\x9a\x91\x8c\xe7\x1c\x85\xb4\x96\x7e\x31\xdf\xda\x34\x42\x4d\xfc\x0c\xe1\xa7\x31\x99\x36\x9c\x77\xce\x68\x81\x51\x32\xbe\xde\xb3\xc6\xce\xeb\x68\xe0\xbb\x4e\xe8\x4d\x27\xd1\xc8\x1b\x7b\xa0\x11\xdd\x03\xeb\x98\xcc\x24\x9b\x33\x09\x86\x64\xc4\x63\x56\x00\x38\xd4\x82\x94\x19\xa8\x2e\x35\x60\x4e\x8b\xb2\x09\x79\x41\x63\x00\x10\x4e\xc0\xe3\xe5\x95\xd2\x75\x70\x8d\xb6\x09\xdd\x20\x2f\x0c\xb6\xd8\xcb\x0c\x39\x13\xfd\xd6\x58\x7d\xeb\x01\x44\x71\xee\x89\xeb\xfb\xee\x30\x1a\x79\x03\x77\x12\xb8\xa0\x3f\x4e\x49\xe3\x05\x6b\xb8\x21\x87\xbd\x7d\x9b\x00\xbf\xf5\x8d\xdd\xae\xfc\x94\x6b\x63\x72\x28\x6a\xac\xb1\xc8\x5b\xfb\x04\xe8\x1b\x20\xe5\x1e\xfc\x09\xd6\xb1\xeb\xc6\xbb\x23\xde\x3c\xf5\xee\x30\x89\x0d\xbe\xbb\xe4\x19\xd7\x78\x8e\x39\x4f\x31\xc8\x6b\x9d\xee\xe5\xaa\x11\x44\x0c\x95\x51\xec\xd7\x78\xcf\xe0\x5f\x70\x2e\xd1\xd8\x3b\xf5\xf1\x28\xee\x9d\x4b\xb2\x22\x61\xd2\x64\x1c\x40\x16\x25\xbd\xc6\x7d\xee\x81\x78\x48\x46\xa8\x04\xbb\xa8\x01\xa7\xd0\x8c\x28\x16\x57\x12\x58\x93\x5c\x2d\xd5\x7a\x56\xdf\x79\x85\xf1\x52\xe4\xbb\x93\xa1\xeb\xdf\xc4\xc0\x18\x2c\xd1\xf7\x68\x36\x36\x02\x96\x0a\x40\xbf\xbc\x00\x59\x00\xbc\x55\xe7\x36\x64\x55\x34\x22\x81\xf8\x1e\xf4\xcb\x68\x09\x01\xf7\x9b\x01\xc1\x39\x03\x71\x90\xec\x47\x15\x53\xba\x47\xce\x55\x45\xb3\x6c\xd5\x86\x77\x09\x2b\x59\x81\x78\x72\x21\xae\xc1\x10\xac\xc8\x60\x76\x4e\x1e\xc4\x42\x32\xf5\x10\x23\x93\x05\xbd\x62\x3d\xe2\xcd\xad\xe3\xd6\x7b\x18\x5d\x14\x5d\xdc\x6c\x7e\x65\x12\x3c\x28\x7c\xc6\xbd\x6f\xb8\x1f\xcc\xce\x15\xa1\x57\x94\x67\x0d\xfc\xbd\x15\xb4\x0f\xa6\xe3\xb1\x07\x98\xd5\x0d\x07\x67\xd1\x60\x3a\x19\x9c\xfb\xbe\x3b\x19\xbc\x01\xc7\xb3\x65\xc6\x7a\x2c\x81\x4f\xb0\x66\xa3\xda\x5b\xd4\x51\xb7\x66\x85\x32\xce\x01\xb6\xa8\x06\xad\xc0\x39\xc9\xc0\x52\x5f\x4b\x5a\x2a\xd0\x06\x98\x7c\x20\x12\x36\xe6\x52\x0a\x49\x0c\x3d\xd0\xa1\x80\x95\x14\x25\xa8\x45\x0b\xe5\x96\x42\xbc\x90\x03\xbc\x86\xa8\xe5\x95\xef\xcc\x22\xf7\x75\xe8\x4e\x20\x2c\x04\x0d\xe9\xe9\xf7\xda\xee\xe5\x89\xdd\xcb\xa9\x5c\x26\xe2\xba\x80\x6f\xe6\x63\x99\x58\xc7\xe4\x25\xcd\x78\x62\xf8\x04\xe9\xa9\x59\x44\xde\x28\x29\x25\xbb\xe2\xec\x9a\x38\x33\x0f\x42\x02\x11\x73\x0a\xae\x0f\x67\xd6\x0b\x96\xdb\x44\x55\xf1\x02\x82\xb7\xce\x1e\x2d\xf9\xde\xd5\xc1\x5e\x33\x4d\x67\x8b\x6d\x3c\x16\x05\x42\x8f\xec\xaa\x1e\xd8\x12\x24\xad\xe9\x25\xac\x1c\x96\x6a\xc4\xf7\x5a\x14\xdf\xc1\x3d\xba\x86\xe0\x11\x76\x64\x7b\x13\x49\x22\x98\x82\x21\x78\xa0\x68\x18\x5e\x7a\xee\x2b\x94\x60\x94\x5e\x10\x5b\x58\x7a\xc3\xc9\xf6\x19\x55\x25\x04\x38\x6f\xef\xd0\xa2\xb5\x7a\xe2\x9c\x66\xec\x5a\x41\x86\x9b\x68\xae\x8d\x7d\x1b\x94\xc8\xb3\x55\x9d\x3a\xa9\xdf\x03\x39\x2d\x40\xe7\x48\x85\xda\xa9\x17\x5c\x99\xb7\x52\x08\xae\xae\x79\xc9\x0c\x04\x86\x08\x02\x3d\x00\x82\xa9\x87\x3d\x2b\x74\xc7\xb3\x76\xac\xb6\xa7\xf3\x72\xaf\xa6\xda\x24\x10\xc0\x97\xd5\xa7\x05\xda\xdd\x78\x7b\xe3\x35\xcc\x58\x96\xd8\x04\xa3\xfe\x0e\xcf\x69\xca\xf6\x7e\x58\xb2\xf4\x9f\x9a\xcb\xb2\x48\x3b\x3d\x32\x62\x70\xce\x2c\x2f\x8d\x99\x42\x1a\x04\xb4\x6c\xde\xcc\xd0\xb3\x9c\xd1\x68\xfa\xca\x1d\xa2\x17\x0c\xd6\x0e\xb5\x31\x04\x88\x69\x21\xde\xa3\x8d\x65\xe7\x05\x19\x3f\xef\x59\xe6\x28\x9c\xd7\x88\x65\x49\x9f\x3c\xba\xd3\x82\x18\xb0\x5e\x32\x59\x73\x6d\x3c\x10\xbc\x0f\xa7\x78\x64\x59\x17\xb0\x05\x97\x54\xb1\x06\x27\x34\xdf\xc9\x25\x8d\x97\xac\x80\x55\xd6\xa9\xd4\x52\x28\x9d\x4a\x13\xa0\xe6\x2b\xf5\xa3\xac\x43\x3a\xea\x47\x19\xd7\xec\x91\x71\x2e\xb9\x82\x9b\x20\x9b\x6f\x44\x65\x3c\xa1\xc1\x6e\xb0\xfe\x90\x0f\x9f\x1b\xe1\x1e\xaf\x82\x1f\x8c\x5a\x86\xbf\x86\x00\x0d\x79\xab\x06\x9e\x07\x87\x9f\x23\xf4\x3c\x78\x76\xf4\xf8\xd1\xa1\x55\xa7\xad\x01\x8c\x58\x4d\x56\x18\xae\x67\x4e\x10\xbc\x9a\xfa\x43\xdc\xbd\x13\xd1\xe6\x13\xb3\x24\x1b\xfe\x6b\x1f\x05\xec\x83\x5d\xe4\xb2\xf6\x89\x57\x4c\xf2\xf9\xaa\x3b\xaf\xb2\x0c\x63\xb1\xd1\x3a\x31\x6c\x5e\x68\xe8\x6e\xd6\x8a\x64\x73\xba\x64\x44\x55\x12\x2d\x1b\xc0\x3b\x7a\xa9\x44\x56\x69\x56\xbb\x9b\xb6\x88\x01\xa7\xbd\xe4\x12\xd3\xcc\xc6\x3d\xdc\x50\x12\x54\x49\xd0\x47\x08\xf3\x69\x96\x61\x90\x6e\x13\x80\x3f\x28\xd9\x5a\x90\x0e\xa8\x47\x07\x65\x70\x55\x52\xa5\x08\xe0\x09\x6f\x12\x84\xce\x68\x04\x4e\xed\xc5\x0d\x77\xa2\x58\x2c\xeb\xcc\x62\x11\xcb\x55\xa9\x49\x2c\xc4\x92\x37\xf6\xc2\x26\x87\x27\x0e\x89\x45\xc2\x6c\xc2\x74\x0c\xa7\xf6\xd9\x67\xa6\xba\x61\x8a\x20\xe1\x94\xbc\x70\xdd\x19\x79\x33\x3d\xf7\x09\xee\xf8\xd0\x09\x1d\x12\x38\x27\xee\x67\x9f\x59\x81\x3b\xf0\xdd\x10\x82\x18\xd2\x27\x9f\x7d\xeb\xfb\x27\x43\xf7\x15\x04\x39\xff\xe4\xbb\x0f\xd6\x82\xb4\x52\x44\xb2\x9c\x81\x2c\xb2\xc4\x38\xa8\x4a\x8b\x6e\x26\x52\x5e\xf4\xac\xd1\xf4\xd4\x9b\x44\xbe\x3b\x76\xc7\xcf\x5d\x3f\x1a\x3a\x6f\x40\x24\x3f\xaf\xdf\xae\x79\x6d\x22\x7a\xa5\x05\xa0\xed\xf5\xeb\x84\x17\x73\x21\xf3\xb5\x1b\x99\xbe\xf0\xdc\x0d\xad\x96\xac\x44\xbc\x88\x25\x4b\xb8\x39\xc7\xdd\x94\x81\xbb\x4c\xa4\xa9\x09\xf2\x01\xc6\x99\x7a\x49\x4d\x16\xd6\xde\xa6\x48\xaf\x19\xa0\xda\x1b\x07\x08\xc1\x37\x9c\x6d\x33\xc1\xfa\xf5\xc0\x1d\x9c\xfb\x77\xe4\xbb\xe0\xad\x9a\x1f\x2d\x08\x2f\x12\x93\x24\x46\x24\x69\xd6\xa9\x34\xd5\x95\x6a\x81\x17\xd8\xb4\x20\x74\xc2\xf3\x20\x32\x13\xdc\x38\xf6\x5d\xcb\xdb\x45\x70\x07\xa5\x66\xdf\x70\x60\x64\x06\x5a\xd6\x05\xcb\x29\xcf\x76\x1b\x75\x90\x58\x7c\xbc\xc9\x70\x6e\xcc\x79\x9b\xab\x52\xb2\x39\x7f\x0f\x1f\x00\x3a\x8c\x29\x45\xfc\x52\x5d\xfe\x10\x0c\x04\xb8\xea\x9e\x15\x9c\x3f\xff\x2d\x77\x10\x46\x80\x47\xbd\xd7\xa4\x4f\xde\x5d\x7c\xfb\xc1\xa6\x6a\xf5\x50\xbd\x25\xef\x6a\x82\xc1\x38\x9c\x35\x20\x0f\xad\x0a\xd7\x0a\xa3\xd3\xda\x2a\xab\x5c\x97\x3d\xe0\x2c\xad\x8a\x9e\x90\xe9\xb3\xa3\xa7\x9f\xdb\xe6\x6e\x0a\xb7\x21\xce\x6b\xdd\xfb\xd1\x8f\xf0\xc6\xe3\x27\x47\xd6\x31\xf1\x8c\x6b\xc4\x58\x97\x15\x89\xc2\x38\xe8\xf1\x93\xa3\x8e\x8d\xd3\x06\xe4\x9a\x67\x19\x7a\x02\xc5\x12\xc0\x56\x10\x49\x61\x3c\x1e\x8e\x02\x70\x38\xf8\xe6\xd1\xd3\xcf\xe1\x45\x08\x5a\xf2\xdc\x2c\x1a\xec\xb0\x7f\x32\x20\x4f\x1e\xef\x7f\xd1\xdb\x4c\x74\x23\x68\xda\x90\xe2\xda\x4c\x45\xb3\x6b\x50\xa6\x66\xc6\xc6\x42\xee\x5a\x63\xbd\x3d\xe6\x50\x4c\x8d\xa2\x2e\xc6\x3c\x80\x99\x8f\x1e\x1d\x1e\x3e\x04\xe0\xca\x55\x83\x26\x7f\x08\xd1\x03\x2d\xea\x57\xea\xd1\x36\xa9\x2b\x50\xef\x3a\x10\x62\x74\xc8\xf7\xf0\xf1\xf7\x5b\x85\x90\xdf\x7c\x47\x8c\x0a\xf6\xac\x13\x7f\x3a\x26\x7d\x52\x08\xc9\xca\x6c\xf5\x7d\xb4\x76\x37\x8b\x54\x46\xfa\x40\x10\x7b\x8d\xfd\xfe\x84\xf1\x60\xe8\xae\x85\x4c\x7a\x6d\x3b\xbf\x3b\xf4\x38\x73\x47\x53\x22\x4a\x66\x2a\x39\x75\x82\x6a\xc1\x08\xd0\x34\x11\x91\x22\x09\x9f\xcf\x99\x64\x85\x6e\x85\x1b\xf0\x5a\xe3\x79\x4d\x78\xb4\x79\x05\x6c\xd6\x36\xdd\xad\xe0\x18\xf7\xd7\xe4\xb3\x7a\x16\x8c\xc3\xa4\x89\xd1\xa2\x1b\x5c\xaa\x25\x2f\x89\xf1\x34\x4d\x41\xb5\x5d\x16\x12\x6d\x49\xe8\x91\x69\x91\xad\xd0\xa7\xa0\xf1\xc7\x80\x9d\x65\xf3\xae\xe2\x69\x01\xc1\xef\xe6\x45\xd5\xb3\x82\x17\xde\x2c\x7a\xe9\xfa\xde\xc9\x9b\xdd\x46\x06\xe8\xc4\x19\x07\xac\xb4\xfd\xe6\x79\xe0\x46\x03\xd7\x0f\xbd\x13\x6f\xd0\x8e\x7b\x77\x54\x7f\xf0\xf4\xef\xab\xfe\x98\x01\x4d\xf5\xe7\x36\x03\x1d\xcd\xde\xeb\xbd\x32\xa3\xbc\xe8\x00\xa6\x6d\xd0\x5b\x23\x42\xc0\xcb\x6c\xe4\x78\x93\x28\x74\x5f\xdf\x11\xfb\x51\xad\x01\x09\x51\x82\x64\x80\x20\xa1\x99\x06\x6b\x0d\x81\x48\x63\x52\xc6\xde\xd8\x25\x39\x53\x8a\xa6\x8c\x5c\x2f\x00\x36\x29\x66\x92\x81\x67\xe1\x78\x64\xe4\x5c\xa1\xfa\x6d\x17\x4b\x8d\xfa\x11\x91\x61\xb4\x07\xca\x60\x76\xcd\xa4\x76\x8c\xbb\x2f\x69\x0e\x98\x4a\x33\xa9\xc8\x82\x96\x25\x07\x71\x76\x86\xc3\x16\xef\x91\x33\xda\xf0\x6f\x5d\xd0\x4a\x2f\x1a\x6c\x75\x85\xf1\x40\x53\x6c\x34\x19\x2f\x6d\x4a\x7d\x31\x16\x6e\x0a\x92\xf3\xa2\xc2\xc3\x71\x06\x21\x66\x23\xa2\xc1\x74\xe8\x46\x23\xef\x25\x22\xb6\x83\xa7\xfb\x77\xd2\x92\x0c\xdc\x49\xa3\x31\xb7\x29\xfa\x6e\xe0\x86\x51\xa3\x47\xbb\xe8\x6e\x65\x41\x11\x21\xd5\x56\x21\x16\xc5\x9c\xd7\xee\xd6\x38\xf2\x04\x37\xb4\x60\xd7\xdb\x76\x83\xe1\xc6\xba\x8d\x77\xe0\x8a\x88\xb2\x4e\x04\xa0\x1d\x53\x1b\xca\xe8\x93\xb4\x68\x68\xb7\x7c\x09\x06\xd9\x2c\xe5\x4a\xcb\xda\xc1\xfb\xee\x0f\xce\x3d\xdf\x8d\xdc\xb1\xe3\x8d\x22\xec\xb1\xf0\xc7\xf7\x44\xee\x60\x13\x6a\xbc\xbd\x55\xde\x20\x57\x1c\xa2\xd6\x5a\x01\x15\xd7\x6c\x43\x3b\xf0\x4e\x27\xde\x24\x82\x78\xe7\xfe\xe2\x14\xaa\xe2\x16\x7f\x30\xaa\x68\x9e\x27\x36\xa1\x71\x2c\x2a\x10\x9c\xeb\x4d\x30\x6a\x62\x07\x93\x1a\xc2\x72\x09\x4d\x72\x5e\xa8\x56\x61\xcb\x3d\xf5\x82\xf0\x13\xf2\x11\x31\x2d\x75\xbc\xa0\x46\x02\x36\x47\xd2\xe6\x68\x9d\x75\x68\xd1\x8c\x06\xce\x2c\x1c\x9c\x39\x4d\xa0\x75\x47\x94\xd6\xaa\xdf\x00\xde\x5a\xb0\x42\x37\x95\x98\x26\x75\x43\x16\x8c\x26\x20\xf8\xeb\x59\x5e\xba\x3e\xe8\xaf\x3f\x7d\xfd\x06\x53\xdc\xee\x24\x04\x93\x72\xe7\x4a\x00\xc8\x81\x34\xc5\x34\xcb\x56\x4d\x89\x01\x84\xc9\x9c\x92\x59\xce\xdd\x9c\xdc\x3d\xf3\xf4\xae\x6d\x04\x95\x69\xf1\x6e\xb4\x9e\xaa\x35\xda\xfb\x84\x39\xef\x5b\x66\x74\xe6\x3a\x43\x74\x6a\xaf\xbb\xaf\xdc\xe7\xf0\xb0\x0b\x5e\xce\xb2\x2e\x60\x86\xdd\xe8\xc9\x48\x7b\x21\x6a\x93\x8c\x89\x07\x60\x03\x37\x61\xbd\x46\x23\xf3\x93\x69\x6d\xa6\xdb\xcb\x82\x70\x02\x8b\x99\x6f\xd7\x98\xdf\x54\xbd\x4b\x29\xae\x78\xc2\xe4\x26\xf8\xc9\x59\x2e\xe4\x0a\x9b\x38\x38\xc6\x40\x10\xd1\x00\x30\x56\xa6\x8b\x03\x3b\x91\x20\xb0\xc7\x71\x6b\x2c\x59\xcc\x79\xda\x98\x18\xb3\x43\xaa\x64\x31\x9a\xdb\x66\x8e\x67\xd6\x31\xe9\xd6\xef\x3d\xc3\x04\xc2\xa6\x9c\x0d\xe1\xae\x21\x42\x56\x4c\xe3\x40\x98\xfe\xd9\x9a\x51\x8c\x6a\x21\x5e\xaa\x61\xdb\x3b\x0c\x97\xea\xa7\xea\x1d\xbe\x81\x5c\x3e\x6b\x2a\x1a\x7d\x1d\x97\x36\x58\x9b\xfe\xb3\x27\x8f\x3e\xff\xc2\x6e\xec\x5d\x3f\xa7\x31\x95\xa2\xb0\x93\xcb\xfe\xbe\x5d\x0a\x91\x61\x1e\xbd\x7f\xb0\xbf\x6f\xf3\x24\x63\x91\xe6\x39\x13\x95\xee\x83\xa9\x6b\x16\x1c\xd5\xed\x5a\x75\x98\xd6\xcc\x7b\x1f\x94\xd6\xad\x6d\xe6\x09\xc8\xc7\x1c\x9d\xc0\x36\x84\xe6\x51\xc6\x97\x2c\x4a\x4d\x93\xd5\x6e\xc4\xcf\x0b\x62\x72\xa0\x10\x4f\xde\x1d\x2e\x00\x27\xa7\x03\x93\x55\xbd\xa2\x19\xbc\xa6\x58\x2c\x00\x97\x1a\x60\x60\x78\x31\x85\xe0\xd3\x41\xe4\x4d\x42\xd7\x7f\xe9\x8c\x48\x9f\x3c\x7a\xb2\xbf\x7f\x23\x35\x90\xf1\x79\x9d\x30\xbc\x41\x87\x36\x94\x4c\x8a\x60\xe4\x9d\xb8\x51\xe8\xe1\x62\x9e\x3e\x79\xbc\xa6\xd3\xde\x13\x78\x6d\x10\xf8\x27\x44\x8b\x25\x83\x30\x2c\xf0\x4f\x6e\x84\x12\x51\xac\xe4\xdc\xb2\x2e\x62\x1a\x2f\xd6\x29\x06\xfc\x42\x68\x42\x4b\xbd\x5b\x44\x8d\x5c\x1a\x19\xcd\x59\x8e\xe3\x3b\xe0\x67\x9d\x59\xb8\x2d\xa5\x27\x62\xf3\x62\x1d\x97\xef\xde\x2b\x08\x95\xd7\xfb\xf2\x64\xbf\x79\xd5\xcc\x64\x9a\x4b\xd6\x33\xd9\xad\x9a\x13\x62\xc1\xc6\xbb\x3d\xfb\xff\x25\x8f\xb5\x06\xe1\xf4\xcf\xc8\xbb\x4d\xea\xe3\xe0\xe0\xf0\xe0\xe0\x5d\x0d\xf8\x2d\xeb\x62\xa1\x75\xd9\x42\x13\x95\x39\x84\x8e\x83\xd5\xf3\xee\x40\x14\x5a\x8a\xac\xeb\x80\xef\xeb\x4e\x25\x4f\x01\x6d\x19\x8b\xb7\x05\x5c\xb1\x3d\x44\x40\x38\xa6\x10\x0c\x3b\x83\x81\x1b\x40\x18\x38\x09\xfd\xe9\x28\xc2\xb4\x54\x34\xf5\xbd\x53\x6f\x82\xd3\x1a\xe4\x95\xb3\x42\xef\xb4\x64\x49\x9d\x5d\x22\x9b\x71\x98\x72\x4d\xb1\x01\x2b\xfb\x86\x1c\x9f\xd1\xab\xf6\xab\xa2\xd8\xe4\x26\x1b\x78\xdd\x4e\xa7\xb4\xc6\xfe\x23\x67\xec\xc8\x2e\x52\x9f\x9a\xc6\x6b\x65\xf0\x1e\xff\x03\x32\x78\x92\x65\x8c\x2a\xd6\xfb\x75\x0e\xc9\xd8\x74\x7c\x7f\x57\x2a\xf6\x1f\x75\x6b\xbf\xbb\xf7\xdd\x5f\x63\x27\x1f\x1d\xfe\x9a\x5b\x79\xb0\x6f\x59\x17\xa0\x94\xb0\x7b\x81\xe9\xf1\x61\xa6\xa6\x61\x82\x14\xdc\xac\x79\x05\x88\x45\x54\xba\xac\x00\xc7\x25\x26\x92\xc2\x54\x7f\xc5\x54\xab\x75\x56\x14\xeb\xa8\x6e\x2e\x60\xb9\xbc\x48\xc1\x7e\x38\x93\xc0\x1b\xd8\xd8\x80\x36\xc4\x2a\xa1\x5f\x5d\xae\xea\xab\x93\xc1\xd3\xc3\xc3\xe6\xf3\x4b\x73\x71\xb4\x8f\x9f\x07\x07\x87\x8f\xd6\x17\xe6\xd1\xa3\x47\x8f\xbe\x58\x5f\x4c\x68\x21\x6c\xf2\x82\xeb\x78\xc1\x0a\x9b\x04\x9a\xe6\x65\xfd\x31\xe6\x59\xc6\xd7\xd7\xb1\x14\x68\xee\xf0\x2b\xbc\xd5\xab\x6d\x61\x0e\x5a\xd8\x4a\xab\x11\x7a\x29\x2a\xdd\x5e\xbf\x62\x0c\xbb\x3c\x9f\xed\xed\xa5\x22\xa3\x45\xda\x13\x32\xdd\x2b\x97\xe9\x1e\x6c\xdb\xde\xb7\xca\x65\xda\x8d\x45\xa1\x34\x2d\xb4\xc2\xa2\xea\xd8\x81\x50\xa8\xe6\xda\xb2\x2e\x4a\x1e\xeb\x4a\xae\x1d\xc1\xb6\x05\xc0\x80\x80\x5e\x51\x4d\xe5\x6e\x13\xe0\xbc\x74\x42\xc7\x8f\xce\x67\xd8\xee\xb4\x65\x10\xcc\x5b\x3b\xc9\xb6\x0a\x0f\xf7\x11\xf7\xdd\xd9\x34\xf0\xc2\xa9\xff\x26\xba\x7b\x1e\xa0\xd5\xdd\x4c\x36\x58\xf0\x82\x29\x56\xa3\xd6\x98\x9a\xfe\x0f\xda\xa4\x11\xcc\x40\xa2\x44\x25\x63\xb6\x29\xe7\xd4\x5b\x18\x17\xbd\x54\x9a\x21\xbd\x58\xe4\xf5\x1a\xf6\x7a\xd6\xa9\x5f\x33\x10\x4c\xcf\xfd\x01\xa6\x1d\xeb\x71\x77\xd4\x5c\xeb\xa7\xb6\x09\xb8\x8c\x5b\x68\x52\x54\x58\x03\x6f\x94\x15\x9b\x5d\x39\x04\x8b\x73\xac\x8d\xe5\xd8\x10\xd8\x04\x20\xcd\xbc\xf7\x06\x1f\x73\x96\x60\x4f\x6d\xd2\xac\x2e\x13\x62\x59\x95\xb0\x70\x45\x86\x93\xa0\x66\x2c\x16\x57\xeb\xc3\x6c\x55\xb7\xac\x63\x93\xac\x33\x31\xb8\xbd\x96\x28\xf5\x6c\x6f\xef\xfa\xfa\xba\x97\xf1\xcb\x66\x4b\x84\x4c\x51\xe1\x12\xa6\x9b\x78\x3d\xfc\x86\xe5\x21\xd7\x37\xd7\x07\x20\x02\x73\x41\xcd\x36\x99\x3c\x90\xba\xa4\x19\x4b\xd6\x20\xfb\xc4\x1d\xba\xbe\x13\xba\xc3\xe8\xc6\x1e\x58\x17\x4d\xa9\x6b\x37\x86\x5f\x50\x99\x98\x42\xe3\xa5\x64\x74\xb9\x29\xa5\xad\x49\x9f\x39\xfe\x30\xc2\x0a\xe2\x73\xdf\x75\x6e\x66\xe9\x9b\xd6\x97\x5a\x64\xce\xfd\x11\x51\xf1\x82\xe5\xbb\x2c\x2e\x55\x30\xd3\xb2\x6e\xbe\x32\x65\x69\x88\x65\xc7\x35\x87\x8d\x26\xd7\x49\x3a\x9b\x74\x52\xae\x3b\xe4\x01\x42\x84\x94\xeb\x67\x7b\x7b\x9d\x87\x35\xd6\xa1\x69\xc1\xd6\xcf\xcc\x37\x7c\xdc\xb3\xcc\x0f\x19\xa2\x73\x7f\x14\x05\x83\x33\x77\xdc\x2a\x4c\x65\x9f\x50\x79\xbd\x6c\x0a\xe6\x2c\xd9\x63\x09\xd7\x86\xef\x36\x8b\xdf\x58\x6f\x25\xa1\x68\x8a\xee\x75\xb3\x19\x3c\x2d\x44\xab\x4e\x49\xd5\xba\x04\x69\x9b\x0c\x66\x59\xe9\x4d\xc1\x16\x0b\x64\xdb\xb5\xda\x3b\xcb\xb4\xd6\x85\xca\xa9\xd4\xab\x12\xac\xd6\xdd\x69\xee\x60\x33\xe8\xf6\x21\x6f\xd2\xdd\x27\xbe\x33\x08\xeb\x39\xd1\x89\x0e\x9d\xe0\xcc\x5d\x7f\x1b\x39\xa1\xfb\x3a\xda\xbe\xe7\x4c\x4e\x47\xee\x30\xfa\xc1\xf9\x34\xdc\xdc\xb4\x2e\x30\x3f\xf0\x76\xb7\xca\x4b\x96\x56\x19\x95\xe4\x41\x21\x8a\x2e\x0e\x7c\x58\x1b\xa1\x4d\xc7\x9e\x90\x29\x2d\xf8\x8f\xeb\x1f\x6c\xb4\xd3\x0c\xe7\x23\xc7\x8f\xa6\xfe\xe9\xba\x13\xa5\x25\xed\xd7\xec\x72\x21\xc4\xf2\xed\x8d\x13\x6f\x20\x84\xc1\x02\xeb\x20\xb5\xce\xee\xad\x7f\x75\xd1\x81\x80\x07\x10\xbc\xca\x68\xbc\x84\x0b\xb4\x05\x32\x31\x97\x45\xaa\x69\xb6\xec\x98\x92\x5f\x50\xd7\x53\x6c\x82\x83\x6d\x52\x0f\x85\x0b\x33\x10\x1b\x82\x32\x8e\x4d\x65\x06\x2c\x6f\x01\xfa\xa1\x3b\xf2\x5e\xba\x3e\x46\x29\xd3\x73\x2c\x19\x1e\xdd\x48\x33\x20\xcc\xe0\x45\x53\x98\x59\x67\x3f\xf1\xe8\x30\x71\x1a\x8e\x82\xdb\xc9\xd3\x70\xab\x8f\x61\xc1\x15\x7a\x8f\xb6\x6f\xe4\x85\x01\x21\x25\x4d\x19\x60\xd3\x53\x6f\x72\x1a\x4d\xce\xc7\x35\x8e\x68\x7e\x7b\x90\x41\xbc\xa7\x79\x91\x2a\x20\x84\x35\x26\x88\xec\x2f\x32\x91\xee\xee\xcb\xa2\x59\x06\xc3\x8c\xdc\x6f\x37\x62\x65\x22\xdd\xeb\x10\x55\x5d\xb6\xfa\x25\xb7\x9b\x46\x07\xf5\x21\x80\x0f\x16\xa6\xd0\x59\x07\xfb\xf5\x79\x18\xdd\x6f\x8e\x04\x74\xf1\x5c\x31\xa3\x33\x26\x36\xad\x15\x33\xaf\x32\xcd\xcb\xa6\x6b\xa1\x81\x76\x35\x59\x1b\x99\xeb\x58\x75\x91\xb4\xbe\x6b\x1d\x93\xe7\xd5\x7c\xce\x64\xd3\xf1\x06\x36\x6d\x41\x8b\x82\x65\x36\x59\x32\x56\x12\xae\x41\x6b\x39\x2e\xc6\x74\xae\x93\x04\xdb\x11\x96\x85\xb8\x26\xd7\xd8\x4f\x0c\x0f\x7b\xd6\xf3\xf3\x93\x13\xd7\x8f\x46\xee\x04\xb7\x13\xc2\x23\xb7\x8e\x11\x43\x49\x63\x5c\x90\x57\xcc\x05\x7c\xbe\xa2\xb2\x80\x4f\x57\x4a\x21\xe1\xe2\x84\x6a\x9a\x75\xb6\xb7\xce\xbc\x65\x8d\xdc\x97\x2e\x84\x7f\xf8\xd5\x6a\x42\xc0\x66\xb7\x6a\x6f\x51\x64\x2b\x3c\x9f\x5e\x7d\x1f\xce\x69\x80\x15\x1c\x8d\xfd\x04\x58\xa7\x5b\x30\x89\xbf\x48\xaa\x29\xae\x69\xe1\xce\xdc\x24\x04\x37\x3f\x89\xca\xce\x46\x27\x93\x29\x33\x15\x4a\x22\x85\x86\xf3\x79\xa0\xae\x01\xe8\xa1\x29\x6e\xb0\x65\x9d\x68\x55\x0f\xb1\xb4\x17\xf9\xd3\xd0\xa4\xf4\x6f\xb7\xc8\x2b\x96\x22\x1f\x6b\x39\x23\x09\xe5\xd8\x5f\xed\x78\xa3\x37\xb7\xde\xbc\x05\xc0\xd5\x82\xcf\xd1\x28\x98\x66\x23\xa4\xb1\xb5\xdf\x87\x4f\xeb\xbe\xb7\x03\xf2\xbd\xef\xc1\x37\xec\x59\x6c\xe3\xf4\x28\x38\xf3\x4e\xb0\x6f\xfa\xe9\x9d\x68\x3d\xc3\xbe\xa7\xed\x69\x9a\xdc\xc4\xa4\x46\xec\xf8\x5f\x53\xf2\x7a\x5f\x72\x89\x90\x7c\xd5\x68\x9b\x71\x54\x0f\x12\x96\x31\xcd\x08\x9d\x6b\x4c\xec\xbf\xc7\x21\x0f\x0d\xad\x75\xd9\x79\x5d\xe5\x37\x9a\x72\xe3\x0c\xf1\xee\xa7\x1e\xa2\x31\xa1\xe0\xcb\x2d\x6c\x7c\xb7\x0c\x8d\x5a\xef\x7e\x6d\x2a\x66\x99\xeb\x84\xa5\xc1\x3c\x09\x57\x65\x46\x57\xa6\x74\xdd\x4e\x25\x9a\x2a\x5b\x9d\x86\xd9\xae\xa2\xd6\xfc\xbc\x17\x32\x7f\xbb\xc9\xd6\xe3\x5e\xa1\x80\x71\x51\x58\x37\xa5\xc0\x37\x92\x67\x5a\x69\x12\xba\xaa\x07\x44\x28\x33\xb7\x86\x89\x22\x6e\xe0\x35\x48\x0c\x7b\x1f\x63\x6d\x80\xbc\x27\xe3\xe7\xed\x60\xcd\x28\xf7\xb8\x3e\x7b\x3c\x39\x2d\x8c\xb9\x30\xc6\xd2\x08\x68\xfb\xa4\x20\x8c\x88\xa5\x49\x79\xd6\x9c\x37\xbf\x09\x84\xdb\x44\x53\xb5\xc4\x20\x8f\x8b\xc4\xe4\x97\x77\xc4\xb5\x7e\x55\xb4\x47\x1b\x7c\x28\x52\x65\x9a\x84\x94\xf9\x79\xe0\xad\xde\x6c\xb0\x97\xf8\xf3\x1e\x92\x63\x0f\x99\x32\x9c\xf4\xcc\x6f\x7e\xa2\xfa\xe6\x5b\x0b\x60\xd3\xf0\x1c\xab\x63\xdf\x37\x1b\x76\xb0\x8f\x35\x31\x7f\x13\x8a\x2c\x18\xcd\xf4\xc2\xf4\xb3\xd7\x64\x20\xb8\x88\xcc\xfd\x08\xef\xef\xa2\x74\xf8\x78\x61\x6d\x1c\xde\x93\x7d\x08\x43\x1c\x99\x56\x9b\x70\x1e\xcd\x79\x91\x90\xef\xa4\x5c\x93\xb9\x8a\x97\xdf\x69\x0c\x78\xb7\x5b\x15\x12\xdc\x16\xee\x5a\xb7\xab\x69\xaa\x3a\xd6\x31\xa2\x70\x8c\xfe\x44\xb1\x8e\xef\xb8\xee\xaa\x38\xc7\xc0\x24\x11\xb1\xc2\x1b\x40\x6c\xef\xa0\xf7\x79\xef\xc8\x72\xfc\xd3\xc0\xd8\xbd\x01\x76\xe4\xb7\x82\x2c\xfc\xf9\x8f\xd2\x3c\x6e\xb6\x07\xd7\x12\xe1\xea\xe0\x99\x7a\x7b\x73\x77\xf1\x50\x76\x2f\x15\x26\xc8\x18\x2d\xaa\x72\x2b\x8e\x93\xf1\x82\x5f\x31\xd5\xde\xb8\xfa\x5e\x14\x9b\xe1\xb7\x26\x31\x47\xb8\x7b\x96\x63\x12\xf2\x9c\x6d\x8a\x69\xeb\x1f\x1a\xf0\x79\x33\x57\x0b\xde\xe2\x0c\x2c\xb1\xa6\xa3\x21\xa0\x8f\x33\x07\xdc\x14\x32\x7b\x91\x72\xcc\xbd\x0c\x0d\x4c\x53\x64\xc1\xd3\x45\xc6\xd3\x85\xe9\x6e\xc7\xdf\xec\xc0\xd1\x48\x96\x8b\x2b\xd3\xc5\x5c\xa4\x4c\xad\xb1\xd9\xd0\x3b\x39\x89\xce\xbc\xd3\xb3\x91\x77\x7a\xd6\x2e\x82\x8e\xe9\xfb\x5b\x79\x0c\xb5\x10\xd7\x08\x44\x12\x3e\x9f\x93\x2b\xce\xae\x51\x4d\x4e\xbd\xd0\xd0\xd9\xe4\x35\xf6\x6f\x51\x30\xb6\xb5\x89\x2b\x80\xb7\xb6\x95\xbd\x87\x68\xdb\xf4\xde\xa2\x1a\x2f\xa8\xa4\x31\xd6\x46\x91\x64\xd6\xee\x94\xbf\x9f\x26\xb6\x70\x3b\x83\xd0\xb4\xee\x1f\x1a\xea\xf7\xc8\x75\x1a\xb7\xa4\x9a\xa6\x29\xfe\xa8\xeb\x0a\x84\x1a\x1c\xe6\xdf\x47\xa8\xd3\xb8\x16\xe9\xd3\x41\xb4\x91\xea\xe9\xba\x8f\xe0\x36\xf2\xc4\x63\xee\xd5\xf7\xdf\x5a\xa6\x89\xd8\x45\x6d\xdc\xb7\xc6\x9e\xef\x4f\x7d\xf3\x1b\x54\x6b\x30\x9a\x4e\xdc\xfa\x7a\x76\x3e\x1a\xd5\x97\xa7\x03\x93\x83\xb6\x2e\x8c\xc9\x58\xb7\xde\x35\x2e\xb4\x95\xbe\x5e\x88\xaa\x2e\x88\x61\x47\x2f\x98\x39\x63\x6e\x10\x00\x9f\x38\xe7\xa3\xb0\x9d\xf1\x7f\x0a\x81\x43\xc9\xdf\xde\x3a\x1b\xae\x59\xae\x4c\xd8\x6c\x7e\x1d\x63\x22\x65\x8a\x08\x16\xcf\xc3\xfc\x96\x3d\x70\x23\x2f\x74\xc7\x98\x5b\x04\x0e\x2b\xa4\x35\xd9\xdd\xf3\xbe\x8e\x50\x41\x16\xcd\x19\x8b\x02\x3d\x71\x06\x3b\x8f\xa4\xdd\xd7\xb3\xd1\xd4\x77\xa3\x2d\x8c\x7c\xb8\xbf\x45\x94\x2b\x55\xdd\x4d\x0e\xc9\x78\x41\x70\x7e\x83\xc8\xc1\x36\x91\x06\x41\x80\x9c\x70\xad\x6e\x10\xc1\x42\x3b\xd7\x2b\x32\x67\x2c\xb1\x4e\x5c\x77\x88\x0d\x94\xa6\x01\xb9\x26\x78\xd4\xe4\xf1\x80\x5c\x47\x43\x14\xde\x8d\x45\x26\x64\x87\xe4\x4c\x53\xa2\x69\x6a\x9b\xc2\xe1\xe5\x8a\x38\x45\x22\x05\x4f\xc8\x6f\xf6\xc9\x11\xfe\x3c\xc6\x01\x65\x34\x55\x79\x7c\x89\x64\x7c\xc9\x48\xa7\x10\x45\xdd\x67\xd8\xf4\x1f\x9a\x53\x30\x45\xe1\xd6\xa9\x2b\xbd\x42\x18\x3d\x6e\xf2\x70\xcf\xd6\xa9\x91\x84\x5d\xb1\x4c\x94\x10\x3b\xa4\x42\xa4\xa6\xff\x66\xef\x9a\x5d\xee\xd5\xb2\xb0\x77\xb8\x7f\xf0\x78\xef\xe0\x60\x2f\x30\x4d\x0c\xdd\xb9\x90\xdd\xd6\x02\xba\xbc\xe8\x0e\x16\x52\xe4\xac\xfb\xe8\x0b\x7c\x58\xb3\x6f\x85\x10\xe1\x47\x83\xe9\x68\xea\x47\x63\x37\x74\xa2\xd0\x39\x25\x7d\xf2\xee\x5b\xf3\xf9\xd1\xa3\xc7\x8f\xde\xd5\x82\x84\x6e\x9c\x17\xe4\x72\xa5\x0d\x28\x33\x36\xe8\x26\x06\x79\xd0\x42\x81\x4f\xc7\xcf\x1f\x1a\xc7\xed\x05\xb3\x91\x63\x1a\x46\x1a\xc7\xff\xf4\xd1\xd3\xa7\x4f\xf6\x9f\xa2\x80\xf5\xd6\x91\xee\xe6\x30\xeb\xe8\xf2\x1e\x81\x00\x74\xb3\x2d\x0f\x47\xfb\xb7\x25\xf5\x5e\x12\xbe\x3b\x9b\xde\x4b\x02\xf0\x54\xfc\x0d\x82\x39\x99\x86\xde\xe0\xa6\x78\x1f\x6d\x91\x69\x47\xe2\xf7\xd2\x82\x98\xfc\x26\x3f\xb8\x43\x4d\x0d\xf9\x1f\xb6\xba\x83\x6d\xb6\x0a\x76\xad\x50\x1d\xbe\x61\x81\xee\xab\x20\x42\x85\xb9\x4f\x85\x1b\xad\xbb\x8f\x52\xd3\xed\xbf\x45\xe7\x11\x2c\xb1\x04\xd1\xd4\x0b\x56\xdd\x91\x80\x99\xad\x9f\x83\x26\x4a\x1e\xef\x2a\x56\xdc\x7e\x0d\x0b\xfe\xcf\xa9\xe2\x31\x71\xb6\x5b\x19\xb0\xf8\x25\x34\x8b\x75\x43\xb0\x2e\xa0\xd6\x49\xbb\xe7\x4e\xe0\x0d\xb0\xc6\x7f\x23\x2d\xb0\xd5\x2f\x70\x27\xfd\x9e\xb5\x21\xd0\xea\x1f\x5d\xe7\xa7\xeb\x16\x9d\x4f\xa7\xb1\xdd\xfd\xe6\xae\xf3\x60\x39\x2d\x4b\x6c\x67\x11\x2d\xac\x11\x67\x54\x01\x2e\x44\xff\xd8\xd3\x22\xcf\xfa\xbc\xe0\xd6\xc5\x7a\x44\xaf\x7e\xed\xad\x65\x5d\xf0\x83\xa7\xc5\x5b\x6b\xe4\x4c\xc0\xf5\x11\x56\x74\xcf\x03\xfb\xc7\x8b\xee\x60\x02\x7f\xcf\x5e\xc0\xdf\xf0\x95\x9d\xb0\xee\xd0\xb5\xe7\xb2\x7b\xe2\xdb\x45\xd6\x9d\x8c\xec\xec\xaa\x3b\x7a\x69\xcb\xaa\xeb\x9f\xdb\x3f\xa4\xdd\xdf\x9a\xd9\x4c\x75\xdd\xc0\x2e\x75\xf7\xb9\x6f\x97\x59\x77\x36\xb2\x2f\xd3\xee\xf3\x53\x9b\xeb\xae\x17\xda\x73\xde\x3d\xf1\x6c\x2d\xbb\xa1\x6f\xc7\xaa\x3b\xf8\xd2\x56\xb2\x1b\xcc\x6c\x75\xd5\x0d\x5c\x7b\x29\xba\x2f\x7c\x3b\xcd\x80\x42\xb5\xec\x9e\x3b\x36\x2b\xba\xa7\xcf\xed\x45\xd5\x3d\x3b\xb7\xd5\xb2\x1b\xbc\xb0\x79\xd2\xf5\x86\xf6\x9c\x76\x3d\xdf\xbe\xe2\xdd\x97\x13\x98\x6b\x16\x62\x67\x38\xf0\xee\x16\x69\xc6\xd5\xc2\xfe\xd5\x7f\xf9\xc9\x5f\xff\xc5\xbf\xfa\xeb\x9f\xfd\xe9\x2f\x7f\xff\x77\xed\x5f\xfd\xf9\x57\x7f\xfb\x9f\xfe\xb5\xf9\xf2\x77\xbf\xf8\x67\x7f\xfb\x1f\xff\xed\x2f\x7f\xf6\x5f\xff\xee\x17\xff\xfc\xe6\x83\xbf\xf9\xdd\x9f\xff\xea\xab\x7f\x0f\x0f\x86\xac\xd2\x2a\x5e\xd8\x73\x49\x8b\xaf\xff\x98\x72\x65\x4f\x58\xc2\x64\x46\x8b\x44\xd9\x19\xd5\x57\x9c\xfd\xd5\x1f\x55\xf6\xc7\x9f\x7c\xfc\x9d\x8f\x5f\x7d\xfc\xea\xc3\xcf\x3f\xfc\xec\xc3\x9f\xdb\xbf\xfc\x83\xff\xf0\xcb\x3f\xfc\xcf\x7f\xf3\x27\xff\xce\x66\xaa\xa4\x5f\xff\x99\xc8\x6c\x30\xc4\x55\x5a\x7d\xfd\x27\x8a\x24\x82\x3c\x97\x54\x71\xb8\x99\xa9\x25\xb7\x3f\xfc\xd9\xc7\x7f\xf1\xe1\x7f\x7e\xf8\x6f\x1f\x7e\xfa\xf1\x27\x86\x86\xcd\x35\xcd\x38\x2d\x84\xad\x2a\x91\x73\x3b\xfc\xfa\x17\x72\xf9\xf5\x1f\x33\xfb\x2f\x7f\x8f\xfd\xd5\x1f\x69\x5e\x50\xfb\xe3\x57\x1f\x7f\xf2\xe1\x7f\xd5\xc3\xd5\x15\x2b\xd4\x92\xda\xff\xf7\xdf\xfc\xe1\xff\xfe\x1f\x7f\xfa\x7f\x7e\xff\xbf\xdb\x29\xcd\x58\x2a\xec\x8f\xbf\xf3\xe1\xe7\x1f\x7f\xf2\xe1\xa7\x1f\xff\xe0\xc3\x5f\x7c\xfc\xea\xe3\xbf\xfc\xf0\xf3\x0f\x3f\xb5\xeb\xbd\x21\x0f\xce\x0b\x4c\xc9\xbe\xe0\x45\x9a\x88\xfc\xa1\x3d\xa6\xe9\x8a\x4a\x3b\xc8\xc4\x15\x2b\xfe\xf2\xf7\x60\x1a\xaf\x48\x44\xc1\x14\xa7\x85\x3d\x63\x12\x3f\x5f\x72\x86\x0d\x91\x8a\xd9\xb3\xf5\xaa\x2c\x93\x3f\x32\x62\x0c\x6e\x08\x20\x51\xc9\xe3\x25\x93\x46\xac\x7a\x70\x33\xa3\x20\x67\x28\x57\x28\x5f\x16\x0a\x17\xe9\x93\x1f\x2f\x2c\x94\x30\xbc\xec\x86\xaf\x2c\xfc\xbb\xfe\x86\x12\x87\xff\x3a\x8b\x85\x62\x07\x7a\x28\x2d\x94\x3d\xd2\x27\x45\x66\xa1\x00\x92\x3e\xc9\xae\x2c\x94\x42\xd2\x27\xb2\xb2\x50\x14\x49\x9f\xfc\x90\x5a\x28\x8f\x30\xa7\xb2\x50\x28\x49\x9f\xe0\xa7\x85\xc2\x09\xdf\x32\x0b\x25\x94\xf4\xc9\x65\x6a\xa1\x98\x92\x3e\xe1\xda\x42\x59\x85\x09\xb9\x85\x02\x8b\x36\xc6\x42\xa9\x25\x7d\x82\x9f\x16\x4a\x2f\xe9\x13\x25\x2d\x14\x61\xb8\xbc\xb2\x50\x8e\x49\x9f\x2c\x85\x85\xc2\x4c\xfa\x24\xcd\x2c\x94\x68\xd2\x27\xd5\xd2\x42\xb1\x36\x8a\x76\xfa\xdc\x42\xf1\x26\x7d\xb2\xa8\x2c\x94\x71\x20\xb2\xb4\x50\xd0\x81\x93\xc4\x42\x69\x47\x13\x64\xa1\xc8\x93\x3e\xb9\xe2\x16\xca\x3d\x2e\xc7\xb2\x2e\xf0\x9f\xda\x79\x6b\x05\x67\xd3\x57\xd1\xc9\x74\x1a\xba\x7e\x84\xc1\xbe\x37\x39\x6d\xd9\xae\x00\x7f\x60\xc0\xeb\x7f\x3b\xa8\xfe\xb7\x06\x08\x7b\xcf\xe2\xaa\x49\x68\x9a\x4a\x9f\xd0\x4c\x6e\x11\x0b\xdd\xf1\x6c\x04\xa1\x3e\x56\xc3\xea\x96\x10\x34\xb9\xff\x2f\x00\x00\xff\xff\xb4\x99\x41\x23\x44\x49\x00\x00" +var _confAppIni = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7c\xdd\x8f\xe4\xca\x75\xdf\x3b\xff\x8a\xba\x2d\x2b\xda\x15\xd8\x3d\x1f\xbb\xb3\x77\xef\x8e\xda\x10\xb7\x9b\x33\x43\x6f\x7f\x89\xe4\xec\xc7\x1d\x2c\xb8\x35\x64\x35\xbb\xd4\x24\x8b\xaa\x2a\xce\x6c\x0b\x81\xa1\x0b\x3f\x38\x09\xe2\xa7\x24\x36\x02\x18\x01\x8c\x20\x31\xe0\xc4\x89\x8c\x24\x80\xac\xc8\xc8\xc3\xb5\xdf\x77\xff\x07\x43\xb2\x83\x04\xfe\x17\x82\x73\x8a\xec\x66\xcf\xf4\xcc\x5d\xcb\x08\x7c\x2f\xb0\xcd\x8f\xaa\x53\xa7\xaa\xce\xc7\xef\x9c\x53\x9c\x6f\x91\xcf\x3e\xfb\x8c\x4c\xdc\x97\xae\x4f\xf0\x9f\xf1\x74\xe8\x9d\xbc\x21\xe1\x99\x17\x90\x13\x6f\xe4\xc2\x7b\xcb\xb4\x9a\x8d\x5c\x27\x70\xc9\xd8\x79\xe1\x92\xc1\x99\x33\x39\x75\x03\x32\x9d\x90\xc1\xd4\xf7\xdd\x60\x36\x9d\x0c\xbd\xc9\x29\x19\x9c\x07\xe1\x74\x4c\x06\xd3\xc9\x89\x77\x7a\x93\x82\x77\x42\xde\x4c\xcf\x89\xe3\xbb\x64\xe6\x0c\x5e\x38\xa7\xd0\x63\xe6\x4f\x5f\x7a\x43\xd7\xb7\xb7\x06\x98\xbe\x02\xca\xb3\x37\x64\x7a\x42\xbc\x10\x69\x58\xc7\x24\x5c\x30\x72\x29\x69\x91\x90\x82\xe6\x8c\x88\x39\xd1\x0b\x46\x68\x59\x66\x3c\xa6\x9a\x8b\xc2\x26\x31\x2d\xc8\x25\x23\x2b\x51\x49\x12\x8b\xbc\xa4\xc5\x8a\x08\x49\x34\xa3\x39\x76\xea\x59\xcf\x7d\x67\x32\x8c\x26\xce\xd8\x25\x7d\x72\x2a\x52\x55\x13\x56\x2b\xa5\x59\x4e\x2a\xc5\x24\xb9\x5e\x08\xa2\x16\xa2\xca\x12\x20\x26\xab\xa2\xe0\x45\x7a\x73\x30\xd5\x23\x9e\x26\x0b\xaa\x48\x21\x08\x9b\xcf\x59\xac\x89\x28\xc8\x2b\x5e\x24\xe2\x5a\xd9\xd6\x31\x11\x7a\xc1\xe4\x35\x57\xcc\x26\x5c\x37\x04\x73\xaa\xe3\x05\xd2\xba\xa2\x59\x85\xb3\xf8\x8d\xf3\xc0\xf5\x09\x2b\xae\xb8\x14\x45\xce\x0a\x4d\xae\xa8\xe4\xf4\x32\x63\x3d\xcb\x3f\x9f\x44\xf8\xba\x4f\x52\xae\x6b\x5e\x1b\x8e\x72\x91\xdc\xbb\x0c\x8c\x03\x07\xa4\x93\xb0\xab\x8e\x4d\x3a\xa5\x14\x49\x07\x96\xa3\xa3\x99\xd2\x1d\x43\x7c\x3c\x1d\xc2\x4a\x24\xec\xca\xb2\x2e\x14\x93\x57\x4c\xbe\xad\x87\x29\xab\xcb\x8c\xc7\xdd\x39\x8d\x61\xb0\x73\x7f\x44\xe6\xb0\x96\xdb\x83\xf5\x2c\xf7\x75\xe8\xfa\x13\x67\x14\x41\x8b\x3e\xf9\xf6\x83\x99\x3f\x0d\xa7\x83\xe9\xe8\xa1\x7a\xb6\xb7\xf7\xed\x07\xc3\xe9\xd8\xf1\x26\x0f\xd5\xb3\x6f\x3f\x38\x0b\xc3\x59\x34\x9b\xfa\xe1\x43\xb5\xb7\x73\x90\x44\xe4\x94\x17\x66\x7f\x77\x0e\x66\x88\x91\x3e\xc9\x44\x4c\xb3\x85\x50\xcd\x9a\x94\x52\x68\x11\x8b\x8c\xe8\x05\xd5\x84\x2b\xd8\xc9\x84\x68\x41\x70\x4e\x24\xe1\x12\x36\x48\x4b\x3a\x9f\xf3\x18\x9e\xdf\x22\x7d\x4c\x06\x95\x94\xac\xd0\xd9\x8a\xa8\xaa\x2c\x85\xd4\x8a\x74\x16\x5a\x97\xb0\x78\xf0\xab\xe0\x62\x1e\xa7\xbc\x43\x40\x0a\x3b\x55\xc1\xdf\x77\x7a\x56\x33\x5f\xd2\x27\xd0\xaa\x66\x88\x26\x89\x64\x4a\xc1\x50\x97\x8c\x64\x5c\x69\x56\xb0\x84\x5c\xae\x6e\x8f\x8c\xcb\xe2\x0c\x87\xb0\xcb\xfb\x3d\xfc\xbf\x99\x95\x90\x9a\x14\x55\x7e\xc9\xe4\x27\x13\x82\xf5\x25\x7d\xf2\x68\x7f\x1f\xa8\x9c\xb2\x82\x49\xaa\x19\x51\x9a\x95\xea\x99\x75\x4c\x7e\x83\xf4\xf6\x52\x91\x2a\x12\x33\xa9\x49\x37\xa6\x7d\x2d\x2b\x46\xba\x49\x25\x91\x4c\xff\xe9\xe7\x4f\xf6\x17\xfb\xf9\xbe\x22\x5d\x58\xe0\x7e\xbe\x82\x9f\x1e\x7b\x4f\xf3\x32\x63\xbd\x58\xe4\xd6\xb1\x75\x4c\xa6\x92\xcc\xa5\xc8\x09\x25\xbd\x72\xfe\x9e\xcc\x79\xc6\x08\x7b\x0f\x1c\xb3\xc4\xbc\x01\xfe\x6a\x7d\xc0\xc1\xf8\x1c\x38\x05\x56\x84\x64\xe4\x41\x22\xac\x63\x52\x08\x0d\x3b\x9d\x32\x0d\x13\x34\xfd\xb1\x63\x29\xf9\x15\x34\x5e\xb2\xd5\x43\xc3\xb6\x28\x59\xa1\x54\x46\xca\x65\xac\x0e\x0e\x49\x97\x17\x48\x15\x47\xef\x8a\x4a\xd7\x77\x2c\x27\xdd\x42\x2c\xd9\x4a\x7d\x5a\xaf\x25\x5b\x35\x9d\xe0\x85\x82\x8b\x84\x29\x6b\xe0\xfa\x61\x84\x36\xac\x4f\xe2\x4a\x69\x91\xef\xa1\x10\xec\x35\xc3\x58\x2f\xdc\x37\x3b\x1b\xd4\x14\xeb\x3d\xcc\x79\xc1\xf3\x2a\x27\x34\xcb\xc4\x35\x4b\x48\x38\x0a\xc8\x15\x93\xca\x68\xea\x0e\x91\x0b\x47\xc1\xc1\x3e\x88\x1a\x5c\x1c\x34\x17\x87\x1d\xdb\x48\x1d\xdc\x3c\xea\xf4\xac\x70\x14\x44\x63\x6f\x12\xbd\x74\xfd\xc0\x9b\x82\x4e\x60\x33\xeb\x98\x9c\xc0\x56\x94\x4c\xe6\x5c\xc1\x28\xe4\x7a\xc1\x8a\x5a\x0f\x1a\x05\xb8\xe2\x94\x9c\x17\xfc\x7d\xa3\x71\x4a\xc4\x4b\xa6\x7b\xd6\xf9\xc4\x7b\x1d\x05\xd3\xc1\x0b\x37\x8c\x66\xae\x3f\xf6\x82\x9a\xf6\x93\x27\x4f\xac\x63\x32\x02\xad\x23\x0f\x86\xe3\x2f\x1f\xae\x0d\xc2\xb5\x90\x4b\x26\x15\x79\xc0\x7a\x69\x8f\x04\xc1\x19\xa9\xca\x84\x6a\xf6\x90\xd0\x38\x66\x4a\x81\x5e\x5f\xb3\x4b\x64\x80\xc7\x0c\x14\xcd\x2b\x48\x2e\x94\x26\x31\x55\x4c\x81\xb5\x26\x89\x40\x49\x28\x98\x51\xda\x78\x41\x8b\x94\xa1\x1c\x24\x6c\x4e\xab\x4c\x1b\x73\x09\x9d\x9d\x4c\x33\x09\x16\x55\x14\xd9\x8a\xf0\xb9\xb1\xf6\x30\xae\x31\x5f\x04\xb6\x0f\x2c\x00\x10\x04\x0a\x0a\xac\x09\x55\x04\xb4\x03\x5f\xf6\xac\xd1\x74\xe0\x8c\x22\x7f\x3a\x0d\xef\xb2\x5a\x6b\x9d\xbc\x6d\xb8\xac\x63\xf2\x6a\xc1\xd0\xb4\x6a\x41\x12\xae\xc0\x54\x93\x0a\x27\x3a\x18\x4e\x70\x51\x94\xa6\x9a\xc7\xa8\x14\x8a\x48\x96\x52\x99\x64\x4c\xa9\x9e\x35\x3d\x39\x19\x79\x13\xb7\xb1\xbb\x73\x9a\x29\xb6\x9b\x60\x26\xd2\x14\x48\xf2\x82\x48\x51\x69\x26\x7b\xd6\xd0\x0b\x9c\xe7\x23\x37\xf2\xa7\xe7\xa1\xeb\x47\xa3\xe9\x29\xe9\x13\xd0\xde\x6d\x0a\xac\x40\x02\x2d\xd3\x40\x32\x76\xc5\x32\x72\xfa\xa5\x37\x43\xbf\x08\x96\xc9\x18\xef\x09\x12\xc4\x17\x0d\x37\x8d\xed\xa1\x7a\x51\xcf\x45\x48\x60\xa4\x4d\x4f\x95\x2c\x06\x75\x26\x09\xd5\xb4\x67\x39\xb3\x59\x34\x74\x42\x27\x9a\x39\xe1\x19\xb8\x13\xaa\xe9\x4e\x9e\xb4\x20\x99\xa0\x09\xa1\x4a\x31\xad\xc8\x03\xde\x63\x3d\xd2\x89\x45\x31\x07\x39\xd7\x2c\x2f\x33\xaa\x19\x1a\x5a\xe3\x19\x3a\x0f\x8d\x2d\x49\xb8\x5a\x12\x5e\x28\xcd\x68\x02\x3e\x8f\xe5\x97\x2c\x49\xc0\x0e\xf2\xc2\xf0\x30\x9a\x3a\xc3\xc8\x09\x02\x37\x0c\xa2\x13\x7f\x3a\x8e\x86\x5e\xf0\xe2\xe6\xa4\x32\x5a\x24\x30\x97\x92\xa6\x6c\x2d\xc1\xb4\x10\xc5\x2a\x17\x15\x3a\x0d\xa9\xec\x96\x7b\xae\xbd\x36\x88\x12\x2f\xe2\xac\x4a\x60\xa9\x55\x75\x89\x8b\xd3\xb8\x9a\x05\x2d\x92\x6c\x63\x92\x25\x03\xf5\x46\x97\xf4\x7e\xd5\xb3\x46\x0e\x82\xa3\x5a\xd0\xee\x12\x1f\x90\x5f\xa3\x2f\x3b\x9c\x13\x61\x85\xe6\x92\x65\xab\x8d\x08\x40\xfb\x8d\xf8\xc0\xd4\xda\xbe\xd3\xf8\x0a\xb0\xa6\xe0\x05\x79\x81\xe4\xe3\x4c\x14\x38\xe9\x9e\x15\x04\x67\xd1\xda\x95\x6e\x5c\xf4\x9d\x5e\xe7\x7e\x4a\xb5\xc7\x39\x3c\x6c\x4b\x8e\x98\x63\x53\x29\x84\xae\xbd\xaf\x90\x2b\x7b\xad\xce\x5c\x91\xce\x6f\x9c\x4d\xc7\xee\x5e\x4f\xa9\x45\xc7\x10\x42\x85\x34\x22\xd4\x26\x05\x5e\x5c\x2d\xba\x4b\xb6\x4a\x59\xb1\x4d\x62\xf3\xdc\xf8\xe4\x8c\x01\xd2\x62\x59\x46\xe6\xbc\x48\x08\xd8\xf7\xeb\x05\x8f\x17\x04\x18\x06\xc3\x42\xb3\xcc\x8c\xf5\xc2\x7d\x73\xea\x4e\x1a\x81\xdd\xd0\x69\x56\xb3\x61\x19\x7b\x49\x06\xae\x08\xc4\x53\x48\x2a\x57\xb5\x5e\xa3\x5d\x05\x2c\x45\x68\x8d\x63\xc0\x99\xd4\x96\xa0\xc5\xb1\x75\xdc\xe6\x59\x6f\xd0\xe6\x86\xe0\x7a\xb8\x35\x73\x51\xe8\x06\xad\xc5\x68\x89\x4c\xbc\x60\xf1\x72\xed\x56\x5a\x03\x2b\xfe\x63\x46\xae\xb9\x5e\x90\x58\x48\xc9\x54\x29\x8c\xb0\xeb\x55\xc9\x7a\xd6\xd8\x9b\x78\xe3\xf3\x31\xd2\x0e\xbc\x2f\xdd\x68\x70\xe6\x0e\x5e\xec\xb6\x41\x92\x5d\x4b\xae\x19\xe9\xfc\x36\x6e\xcf\x1e\xad\xf4\x42\x48\xfe\x63\x96\x44\xe0\x58\x3b\xc6\xdb\x53\x0d\x76\x4e\x6a\x9b\xf0\xb4\x10\x92\x25\x66\x45\x2a\xc5\xc8\x65\xc5\x33\x5d\x4b\x8b\x31\xcb\x3d\xcb\x77\x5f\xf9\x5e\xe8\x46\xce\x79\x78\x36\xf5\xbd\x2f\xdd\x21\xf0\x12\x44\x4e\x18\x05\xa1\x83\x22\xb4\x83\x15\x1c\x81\xd0\x9d\x14\xb1\x1b\xa8\x42\x14\xb8\xfe\x4b\x44\xc9\x6d\x8d\x28\x98\x06\xe7\x44\x78\xa1\x99\x9c\xd3\xd8\x60\xca\xdb\x84\xd0\x2a\x21\xae\x22\x60\x13\x81\xde\xc8\x0b\x42\x77\x12\x9d\x4d\x83\xf0\x5e\x50\xf6\xf7\x25\x58\xab\xca\xb7\x1f\x34\x7a\xb3\x56\x3a\x68\x0f\x4a\x03\x46\xa0\x04\x08\x15\xf3\x72\x01\x7e\x15\x86\x88\x45\x51\xb0\x18\xc3\x0e\xd4\xc8\x5d\x6b\xb1\x5e\x85\x68\xe0\xcd\xce\x5c\x3f\x20\x7d\x42\x99\x3a\x38\x7c\xda\x8d\xb5\xb4\xf1\xfa\x8b\xc3\xf5\xf5\xe1\xd1\x93\xcd\xf3\xc3\xa7\xdd\x34\xce\xbf\x6f\xb0\xd2\x02\x20\x9e\x4d\xa8\x8c\xe7\xa2\x92\x87\x47\x4f\xd6\xd7\x07\x87\x4f\xc1\x7c\x0d\xd9\x9c\x17\x6c\x0d\x68\x68\x96\x0a\xc9\xf5\x22\x57\xa8\x82\x7a\xc1\xb8\x5c\x8b\x27\xc8\x65\xc6\x8a\x54\x2f\xc8\x03\x10\x8c\xee\x41\xdb\xea\x51\x94\xcd\x87\x3d\xeb\x02\x86\xad\xfb\x80\x88\x45\x20\xcb\xea\xad\xe5\x0e\x0f\x8f\x8e\x0e\xbe\x00\xeb\x72\xf4\xc4\x72\x07\xc3\xc0\x21\xa4\xbe\xf3\xf1\x1a\xef\xf6\x1f\x3f\xb5\x86\xeb\xdb\x83\xfd\xc3\xc7\x96\x75\x21\x59\x29\x14\x07\xa5\x6a\x22\x1a\x34\x46\xb7\xfc\x5a\x4e\x0b\x9a\xb2\x84\xac\xdb\x73\xa6\xb6\xad\xcc\x6f\x23\x60\xee\xb6\x1b\x74\x2c\x30\x56\x6b\x3b\xa5\x62\xc9\x4b\x8d\xb3\x69\x64\xa0\x01\x74\x36\x51\x22\x67\x9a\xe7\x4c\x91\xb8\x09\x2a\x3b\xc6\xe6\x0d\x7c\x6f\x16\x46\xe1\x9b\x19\x60\x81\x4b\xaa\x16\x66\x75\x71\x60\x67\x12\x78\x00\x84\xa4\x62\xba\x76\x53\xa4\x2a\x24\x8b\x45\x5a\x80\x26\x36\xef\x7a\x16\xb4\x8c\x06\x67\x8e\x1f\xb8\xe1\x4d\x63\x31\x17\x32\x66\x04\x3c\xd2\x8a\x14\xec\x7a\x33\xc9\x55\x6d\xda\x6b\x9c\xdd\xb3\x4e\xa6\xfe\xc0\x8d\x66\xbe\xf7\xd2\x09\xdd\x1b\x9a\x94\x66\xe2\x92\x66\x24\xe3\x39\x47\x21\xad\xa5\x5f\xcc\xb7\x16\x8d\x50\x13\x3f\x43\xf8\x69\x4c\xa6\x0d\xfb\x9d\x33\x5a\x60\x94\x8c\xdd\x7b\xd6\xd8\x79\x1d\x0d\x7c\xd7\x09\xbd\xe9\x24\x1a\x79\x63\x0f\x34\xa2\x7b\x60\x1d\x93\x99\x64\x73\x26\xc1\x90\x8c\x78\xcc\x0a\x00\x87\x5a\x90\x32\x03\xd5\xa5\x06\xcc\x69\x51\x36\x21\x2f\x68\x0c\x00\xc2\x09\x78\xbc\xbc\x52\xba\x0e\xae\xd1\x36\xa1\x1b\xe4\x85\xc1\x16\x7b\x99\x21\x67\xa2\xdf\x1a\xab\x6f\xbd\x80\x28\xce\x3d\x71\x7d\xdf\x1d\x46\x23\x6f\xe0\x4e\x02\x17\xf4\xc7\x29\x69\xbc\x60\x0d\x37\xe4\xb0\xb7\x6f\x13\xe0\xb7\x7e\xb0\xdb\x95\x9f\x72\x6d\x4c\x0e\x45\x8d\x35\x16\x79\x6b\x9d\x00\x7d\x03\xa4\xdc\x83\x7f\x82\x75\xec\xba\xf1\xee\x88\x37\x4f\xbd\x3b\x4c\x62\x83\xef\x2e\x79\xc6\x35\xee\x63\xce\x53\x0c\xf2\x5a\xbb\x7b\xb9\x6a\x04\x11\x43\x65\x14\xfb\x35\xde\x33\xf8\x17\x9c\x4b\x34\xf6\x4e\x7d\xdc\x8a\x7b\xc7\x92\xac\x48\x98\x34\x19\x07\x90\x45\x49\xaf\x71\x9d\x7b\x20\x1e\x92\x11\x2a\xc1\x2e\x6a\xc0\x29\x34\x23\x8a\xc5\x95\x04\xd6\x24\x57\x4b\xb5\x1e\xd5\x77\x5e\x61\xbc\x14\xf9\xee\x64\xe8\xfa\x37\x31\x30\x06\x4b\xf4\x3d\x9a\x8d\x8d\x80\xa5\x02\xd0\x2f\x2f\x40\x16\x00\x6f\xd5\xb9\x0d\x59\x15\x8d\x48\x20\xbe\x07\xfd\x32\x5a\x42\xc0\xfd\x66\x40\x70\xce\x40\x1c\x24\xfb\x51\xc5\x94\xee\x91\x73\x55\xd1\x2c\x5b\xb5\xe1\x5d\xc2\x4a\x56\x20\x9e\x5c\x88\x6b\x30\x04\x2b\x32\x98\x9d\x93\x07\xb1\x90\x4c\x3d\xc4\xc8\x64\x41\xaf\x58\x8f\x78\x73\xeb\xb8\xd5\x0f\xa3\x8b\xa2\x8b\x8b\xcd\xaf\x4c\x82\x07\x85\xcf\xb8\xf7\x0d\xf7\x83\xd9\xb9\x22\xf4\x8a\xf2\xac\x81\xbf\xb7\x82\xf6\xc1\x74\x3c\xf6\x00\xb3\xba\xe1\xe0\x2c\x1a\x4c\x27\x83\x73\xdf\x77\x27\x83\x37\xe0\x78\xb6\xcc\x58\x8f\x25\xf0\x0b\xd6\x6c\x54\x7b\x8b\x3a\xea\xd6\xac\x50\xc6\x39\xc0\x12\xd5\xa0\x15\x38\x27\x19\x58\xea\x6b\x49\x4b\x05\xda\x00\x83\x0f\x44\xc2\xc6\x5c\x4a\x21\x89\xa1\x07\x3a\x14\xb0\x92\xa2\x04\xb5\x68\xa1\xdc\x52\x88\x17\x72\x80\xd7\x10\xb5\xbc\xf2\x9d\x59\xe4\xbe\x0e\xdd\x09\x84\x85\xa0\x21\x3d\xfd\x5e\xdb\xbd\x3c\xb1\x7b\x39\x95\xcb\x44\x5c\x17\x70\x67\x7e\x96\x89\x75\x4c\x5e\xd2\x8c\x27\x86\x4f\x90\x9e\x9a\x45\xe4\x8d\x92\x52\xb2\x2b\xce\xae\x89\x33\xf3\x20\x24\x10\x31\xa7\xe0\xfa\x70\x64\xbd\x60\xb9\x4d\x54\x15\x2f\x20\x78\xeb\xec\xd1\x92\xef\x5d\x1d\xec\x35\xc3\x74\xb6\xd8\xc6\x6d\x51\x20\xf4\xc8\xae\xea\x81\x2d\x41\xd2\x9a\x5e\xc2\xcc\x61\xaa\x46\x7c\xaf\x45\xf1\x1d\x5c\xa3\x6b\x08\x1e\x61\x45\xb6\x17\x91\x24\x82\x29\x68\x82\x1b\x8a\x86\xe1\xa5\xe7\xbe\x42\x09\x46\xe9\x05\xb1\x85\xa9\x37\x9c\x6c\xef\x51\x55\x42\x80\xf3\xf6\x0e\x2d\x5a\xab\x27\x8e\x69\xda\xae\x15\x64\xb8\x89\xe6\xda\xd8\xb7\x41\x89\x3c\x5b\xd5\xa9\x93\xba\x1f\xc8\x69\x01\x3a\x47\x2a\xd4\x4e\xbd\xe0\xca\xf4\x4a\x21\xb8\xba\xe6\x25\x33\x10\x18\x22\x08\xf4\x00\x08\xa6\x1e\xf6\xac\xd0\x1d\xcf\xda\xb1\xda\x9e\xce\xcb\xbd\x9a\x6a\x93\x40\x00\x5f\x56\xef\x16\x68\x77\xe3\xed\x8d\xd7\x30\x6d\x59\x62\x13\x8c\xfa\x3b\x3c\xa7\x29\xdb\xfb\x61\xc9\xd2\x7f\x6a\x2e\xcb\x22\xed\xf4\xc8\x88\xc1\x3e\xb3\xbc\x34\x66\x0a\x69\x10\xd0\xb2\x79\x33\x42\xcf\x72\x46\xa3\xe9\x2b\x77\x88\x5e\x30\x58\x3b\xd4\xc6\x10\x20\xa6\x85\x78\x8f\x36\x96\x9d\x17\x64\xfc\xbc\x67\x99\xad\x70\x5e\x23\x96\x25\x7d\xf2\xe8\x4e\x0b\x62\xc0\x7a\xc9\x64\xcd\xb5\xf1\x40\xd0\x1f\x76\xf1\xc8\xb2\x2e\x60\x09\x2e\xa9\x62\x0d\x4e\x68\xee\xc9\x25\x8d\x97\xac\x80\x59\xd6\xa9\xd4\x52\x28\x9d\x4a\x13\xa0\xe6\x2b\xf5\xa3\xac\x43\x3a\xea\x47\x19\xd7\xec\x91\x71\x2e\xb9\x82\x87\x20\x9b\x6f\x44\x65\x3c\xa1\xc1\x6e\x30\xff\x90\x0f\x9f\x1b\xe1\x1e\xaf\x82\x1f\x8c\x5a\x86\xbf\x86\x00\x0d\x79\xab\x06\x9e\x07\x87\x9f\x23\xf4\x3c\x78\x76\xf4\xf8\xd1\xa1\x55\xa7\xad\x01\x8c\x58\x4d\x56\x18\xae\x67\x4e\x10\xbc\x9a\xfa\x43\x5c\xbd\x13\xd1\xe6\x13\xb3\x24\x1b\xfe\x6b\x1f\x05\xec\x83\x5d\xe4\xb2\xf6\x89\x57\x4c\xf2\xf9\xaa\x3b\xaf\xb2\x0c\x63\xb1\xd1\x3a\x31\x6c\x3a\x34\x74\x37\x73\x45\xb2\x39\x5d\x32\xa2\x2a\x89\x96\x0d\xe0\x1d\xbd\x54\x22\xab\x34\xab\xdd\x4d\x5b\xc4\x80\xd3\x5e\x72\x79\x63\x9b\x00\x72\x6e\xc1\xdb\xda\xb9\x97\x02\x96\x05\x36\x6a\x3a\x73\x27\x60\x16\xd1\xdc\x3c\xda\xbf\xd1\x9f\x27\x19\xbb\xbf\xbf\x37\x1c\xb9\xed\xfe\xd6\x45\xe3\x9e\x6e\x28\x29\x9a\x04\xe8\xcb\x0b\xa5\x69\x96\x61\x92\xc0\x26\x00\xbf\x50\xb3\xb4\x20\x1d\x50\xcf\x0e\xea\xc0\xaa\xa4\x4a\x11\xc0\x33\xde\x24\x08\x9d\xd1\x08\x9c\xea\x8b\x1b\xee\x4c\xb1\x58\xd6\x99\xcd\x22\x96\xab\x52\x93\x58\x88\x25\x6f\xec\x95\x4d\x0e\x4f\x1c\x12\x8b\x84\xd9\x84\xe9\x18\xa4\xe6\xb3\xcf\x4c\x75\xc5\x14\x61\xc2\x29\x79\xe1\xba\x33\xf2\x66\x7a\xee\x13\xdc\xf1\xa1\x13\x3a\x24\x70\x4e\xdc\xcf\x3e\xb3\x02\x77\xe0\xbb\x21\x04\x51\xa4\x4f\x3e\xfb\xd6\xf7\x4f\x86\xee\x2b\x08\xb2\xfe\xc9\x77\x1f\xac\x05\x79\xa5\x88\x64\x39\x03\x5d\x60\x89\x71\x90\x95\x16\xdd\x4c\xa4\xbc\xe8\x59\xa3\xe9\xa9\x37\x89\x7c\x77\xec\x8e\x9f\xbb\x7e\x34\x74\xde\xc0\x22\x7d\x5e\xf7\xae\x79\x6d\x32\x0a\x4a\x0b\x40\xfb\xeb\xee\x84\x17\x73\x21\xf3\xb5\x1b\x9b\xbe\xf0\xdc\x0d\xad\x96\xac\x46\xbc\x88\x25\x4b\xb8\x91\xa3\xdd\x94\x81\xbb\x4c\xa4\xa9\x49\x32\x00\x8c\x34\xf5\x9a\x9a\x2c\xcc\xbd\x4d\x91\x5e\x33\x40\xd5\x37\x36\x10\x82\x7f\xd8\xdb\x66\x80\x75\xf7\xc0\x1d\x9c\xfb\x77\xe4\xdb\xa0\x57\xcd\x8f\x16\x84\x17\x89\x49\x52\x23\x92\x35\xf3\x54\x9a\xea\x4a\xb5\xc0\x13\x2c\x5a\x10\x3a\xe1\x79\x10\x99\x01\x6e\x6c\xfb\xae\xe9\xed\x22\xb8\x83\x52\xb3\x6e\xd8\x30\x32\x0d\x2d\xeb\x82\xe5\x94\x67\xbb\x9d\x0a\x48\x2c\xbe\xde\x64\x58\x37\xee\xa4\xcd\x55\x29\xd9\x9c\xbf\x87\x1f\x00\x3d\xc6\x94\x23\x7e\xaa\x2e\x7f\x08\x06\x0a\xa0\x42\xcf\x0a\xce\x9f\xff\x96\x3b\x08\x23\xc0\xc3\xde\x6b\xd2\x27\xef\x2e\xbe\xfd\x60\x53\x35\x7b\xa8\xde\x92\x77\x35\xc1\x60\x1c\xce\x1a\x90\x89\x56\x8d\x6b\x85\xd1\x71\xed\x15\x54\xae\xcb\x1e\x70\x96\x56\x45\x4f\xc8\xf4\xd9\xd1\xd3\xcf\x6d\xf3\x34\x85\xc7\x10\x67\xb6\x9e\xfd\xe8\x47\xf8\xe0\xf1\x93\x23\xeb\x98\x78\x8d\x1a\x4b\x4d\x58\x91\x28\x8c\xc3\x1e\x3f\x39\xea\xd8\x38\x6c\x40\xae\x79\x96\xa1\x27\x52\x2c\x01\x6c\x07\x91\x1c\xe6\x03\xc2\x51\x00\x0e\x0f\x7b\x1e\x3d\xfd\x1c\x3a\x42\xd0\x94\xe7\x66\xd2\xe0\x07\xfc\x93\x01\x79\xf2\x78\xff\x8b\xde\x66\xa0\x1b\x41\xdb\x86\x14\xd7\x66\x28\x9a\x5d\x83\x32\x35\x23\x36\x16\x7a\xd7\x1c\xeb\xe5\x31\x9b\x62\x6a\x24\x75\x31\xe8\x01\x8c\x7c\xf4\xe8\xf0\xf0\x21\x00\x67\xae\x1a\x34\xfb\x43\x88\x5e\x68\x51\x77\xa9\x5b\xdb\xa4\xae\x80\xbd\xeb\x40\x88\xd3\x21\xdf\xc3\xd7\xdf\x6f\x15\x62\x7e\xf3\x1d\x31\x2a\xd8\xb3\x4e\xfc\xe9\x98\xf4\x49\x21\x24\x2b\xb3\xd5\xf7\xd1\xda\xde\x2c\x92\x19\xe9\x03\x41\xec\x35\xfe\xe3\x13\xda\x83\xa1\xbb\x16\x32\xe9\xb5\xfd\xcc\xee\xd0\xe7\xcc\x1d\x4d\xc1\xa4\x9b\x4a\x52\x9d\x20\x5b\x30\x02\x34\x4d\x44\xa6\x48\xc2\xe7\x73\x26\x59\xa1\x5b\xe1\x0e\x74\x6b\x3c\xbf\x09\xcf\x36\x5d\xc0\x66\x6d\xd3\xdd\x0a\xce\x71\x7d\x4d\x3e\xad\x67\x41\x3b\x4c\xda\x18\x2d\xba\xc1\xa5\x5a\xf2\x92\x18\x4f\xd7\x14\x74\xdb\x65\x29\xd1\x96\x84\x1e\x99\x16\xd9\x0a\x7d\x1a\x1a\x7f\x4c\x18\xb0\x6c\xde\x55\x3c\x2d\x20\xf8\xde\x74\x54\x3d\x2b\x78\xe1\xcd\xa2\x97\xae\xef\x9d\xbc\xd9\x6d\x64\x80\x4e\x9c\x71\xc0\x6a\xdb\x3d\xcf\x03\x37\x1a\xb8\x7e\xe8\x9d\x78\x83\x76\xdc\xbd\xa3\xfa\x84\xbb\x7f\x5f\xf5\xc9\x34\x68\xaa\x4f\xb7\x19\xe8\x68\xf6\x5e\xef\x95\x19\xe5\x45\x07\x30\x75\x83\x1e\x1b\x11\x02\x5e\x66\x23\xc7\x9b\x44\xa1\xfb\xfa\x8e\xd8\x93\x6a\x0d\x48\x8c\x12\x24\x03\x04\x09\xcd\x34\x58\x6b\x08\x84\x1a\x93\x32\xf6\xc6\x2e\xc9\x99\x52\x34\x65\xe4\x7a\x01\xb0\x4d\x31\x93\x8c\x3c\x0b\xc7\x23\x23\xe7\x0a\xd5\x6f\xbb\x58\x6b\xd4\x8f\x88\x0c\xa3\x4d\x50\x06\xb3\x6a\x26\xb5\x64\xe0\x46\x49\x73\xc0\x74\x9a\x49\x45\x16\xb4\x2c\x39\x88\xb3\x33\x1c\xb6\x78\x8f\x9c\xd1\x86\x7f\xeb\x82\x56\x7a\xd1\x60\xbb\x2b\x8c\x47\x9a\x62\xa7\xc9\xb8\x69\x53\x6a\x8c\xb1\x70\x54\x90\x9c\x17\x15\x6e\x8e\x33\x08\x31\x1b\x12\x0d\xa6\x43\x37\x1a\x79\x2f\x11\x31\x1e\x3c\xdd\xbf\x93\x96\x64\xe0\x4e\x1a\x8d\xb9\x4d\xd1\x77\x03\x37\x8c\x1a\x3d\xda\x45\x77\x2b\x0b\x8b\x08\xad\xb6\x0a\xb1\x28\xe6\xbc\x76\xb7\xc6\x91\x27\xb8\xa0\x05\xbb\xde\xb6\x1b\x0c\x17\xd6\x6d\xbc\x03\x57\x44\x94\x75\x22\x02\xed\x98\xda\x50\x46\x9f\xa4\x45\x43\xbb\xe5\x4b\x30\xc8\x67\x29\x57\x5a\xd6\x0e\xde\x77\x7f\x70\xee\xf9\x6e\xe4\x8e\x1d\x6f\x14\xe1\x19\x0f\x7f\x7c\x4f\xe6\x00\x6c\x42\x8d\xf7\xb7\xca\x2b\xe4\x8a\x43\xd4\x5c\x2b\xa0\xe2\x9a\x6d\x68\x07\xde\xe9\xc4\x9b\x44\x10\x6f\xdd\x5f\x1c\x43\x55\xdc\xe2\x0f\x5a\x15\xcd\xfb\xc4\x26\x34\x8e\x45\x05\x82\x73\xbd\x09\x86\x4d\xec\x62\x52\x53\x58\xae\xa1\x49\xce\x0b\xd5\x2a\xac\xb9\xa7\x5e\x10\x7e\x42\x3e\x24\xa6\xa5\x8e\x17\xd4\x48\xc0\x66\x4b\xda\x1c\xad\xb3\x1e\x2d\x9a\xd1\xc0\x99\x85\x83\x33\xa7\x09\xf4\xee\x88\x12\x5b\xf5\x23\xc0\x5b\x0b\x56\xe8\xa6\x12\xd4\xa4\x8e\xc8\x82\xd1\x04\x04\x7f\x3d\xca\x4b\xd7\x07\xfd\xf5\xa7\xaf\xdf\x60\x8a\xdd\x9d\x84\x60\x52\xee\x9c\x09\x00\x39\x90\xa6\x98\x66\xd9\xaa\x29\x71\x80\x30\x99\x5d\x32\xd3\xb9\x9b\x93\xbb\x47\x9e\xde\xb5\x8c\xa0\x32\x2d\xde\x8d\xd6\x53\xb5\x46\x7b\x9f\x30\xe6\x7d\xd3\x8c\xce\x5c\x67\x88\x4e\xed\x75\xf7\x95\xfb\x1c\x5e\x76\xc1\xcb\x59\xd6\x05\x8c\xb0\x1b\x3d\x19\x69\x2f\x44\x6d\x92\x31\x84\x00\x36\x70\x11\xd6\x73\x34\x32\x3f\x99\xd6\x66\xba\x3d\x2d\x08\x27\xb0\x98\xfa\x76\x8d\xf9\x4d\xd5\xbd\x94\xe2\x8a\x27\x4c\x6e\x82\xaf\x9c\xe5\x42\xae\xf0\x10\x09\xc7\x18\x0c\x22\x2a\x00\xc6\xca\x9c\x22\xc1\x93\x50\xa4\x4f\x4c\xbb\x35\x96\x2c\xe6\x3c\x6d\x4c\x8c\x59\x21\x55\x42\xb4\x73\xc5\xd6\x63\x3c\xb3\x8e\x49\xb7\xee\xf7\x0c\x13\x18\x9b\x72\x3a\x84\xdb\x86\x08\x59\x31\x8d\x0d\x61\xf8\x67\x6b\x46\x31\xaa\x86\x78\xad\x86\x6d\xef\x30\x5c\xab\xdf\xaa\x77\xd8\x03\xb9\x7c\xd6\x54\x54\xfa\x3a\x2e\x6d\xb0\x36\xfd\x67\x4f\x1e\x7d\xfe\x85\xdd\xd8\xbb\x7e\x4e\x63\x2a\x45\x61\x27\x97\xfd\x7d\x1b\x42\x30\xcc\xe3\xf7\x0f\xf6\xf7\x6d\x08\xd4\x22\xcd\x73\x26\x2a\xdd\x07\x53\xd7\x4c\x38\xaa\x8f\x8b\xd5\x61\x62\x33\xee\x7d\x50\x5a\xb7\x96\x99\x27\x20\x1f\x73\x74\x02\xdb\x10\x9a\x47\x19\x5f\xb2\x28\x35\x87\xbc\x76\x23\x7e\x5e\x10\x93\x83\x85\x78\xf6\xee\x70\x01\x38\x39\x1d\x98\xac\xee\x15\xcd\xa0\x9b\x62\xb1\x00\x5c\x6a\x80\x81\xe1\xc5\x14\xa2\x4f\x07\x91\x37\x09\x5d\xff\xa5\x33\x82\x88\xf3\xc9\xfe\xcd\x98\x35\xe3\xf3\x3a\x61\x79\x83\x0e\x6d\x28\x99\xc8\x75\xe4\x9d\xb8\x51\xe8\xe1\x64\x9e\x3e\x79\xbc\xa6\xd3\x5e\x13\xe8\x36\x08\xfc\x13\xa2\xc5\x92\x41\x18\x16\xf8\x27\x37\x42\x89\x28\x56\x72\x6e\x59\x17\x31\x8d\x17\xeb\x14\x07\xde\x10\x9a\xd0\x52\xef\x16\x51\x23\x97\x46\x46\x73\x96\x63\xfb\x0e\xf8\x59\x67\x16\x6e\x4b\xe9\x89\xd8\x74\xac\xf3\x02\xbb\xd7\x0a\x42\xe5\xf5\xba\x3c\xd9\x6f\xba\x9a\x91\xcc\xe1\x96\xf5\x48\x76\x2b\xa8\x47\x2c\xd8\x78\xb7\x67\xff\xbf\xe4\xb1\xd6\x20\x1c\xfe\x19\x79\xb7\x49\xbd\x1c\x1c\x1c\x1e\x1c\xbc\xab\x01\xbf\x65\x5d\x2c\xb4\x2e\x5b\x68\xa2\x32\x9b\xd0\x71\xb0\x7a\xdf\x1d\x88\x42\x4b\x91\x75\x1d\xf0\x7d\xdd\xa9\xe4\x29\xa0\x2d\x63\xf1\xb6\x80\x2b\x1e\x4f\x11\x10\x8e\x29\x04\xc3\xce\x60\xe0\x06\x10\x06\x4e\x42\x7f\x3a\x8a\x30\x2d\x16\x4d\x7d\xef\xd4\x9b\xe0\xb0\xd9\x5c\xdd\xae\x63\xad\x55\x62\x74\x12\x10\x81\x71\x9c\xea\x59\x53\x0c\xe1\x82\xad\x0c\x5f\x36\x57\xdd\xba\x01\x20\x22\x84\x71\x39\x2b\xf4\x4e\xb3\x98\xd4\xa9\x32\xb2\x69\x87\xf9\xe3\x14\x4f\x93\x65\xdf\x90\xb0\x34\x1c\xb5\xbb\x8a\x62\x93\x68\x6d\xb0\x7a\x9b\xb9\x56\xdb\x7f\xe4\xf4\x23\xd9\x45\xea\x53\x73\x92\xad\x74\xe4\xe3\x7f\x40\x3a\x52\xb2\x8c\x51\xc5\x7a\xbf\xce\x26\x19\x07\x81\xfd\x77\xe5\x95\xff\x51\x97\xf6\xbb\x7b\xdf\xfd\x35\x56\xf2\xd1\xe1\xaf\xb9\x94\x07\xfb\x96\x75\x01\x1a\x0e\xab\x17\x98\x03\x4b\xcc\x14\x68\x4c\xc4\x83\x8b\x35\xaf\x00\xfe\x88\x4a\x97\x15\x80\xc2\xc4\x84\x65\x58\xb7\xa8\x98\x6a\x9d\x03\x16\xc5\x3a\x44\x9c\x0b\x98\x2e\x2f\x52\x30\x46\xce\x24\xf0\x06\x36\x9e\xa6\x1b\x62\xc9\xd3\xaf\x2e\x57\xf5\xd5\xc9\xe0\xe9\xe1\x61\xf3\xfb\xa5\xb9\x38\xda\xc7\xdf\x83\x83\xc3\x47\xeb\x0b\xf3\xea\xd1\xa3\x47\x5f\xac\x2f\x26\xb4\x10\x36\x79\xc1\x75\xbc\x60\x85\x4d\x02\x4d\xf3\xb2\xfe\x19\xf3\x2c\xe3\xeb\xeb\x58\x0a\xb4\x9d\x78\x0b\xbd\x7a\xb5\x61\xcd\x41\x0b\x5b\x39\x3a\x42\x2f\x45\xa5\xdb\xf3\x57\x8c\xe1\x91\xd5\x67\x7b\x7b\xa9\xc8\x68\x91\xf6\x84\x4c\xf7\xca\x65\xba\x07\xcb\xb6\xf7\xad\x72\x99\x76\x63\x51\x28\x4d\x0b\x30\x2b\x27\x53\x00\xfc\xa4\xdf\x70\x6d\x59\x17\x25\x8f\x75\x25\xd7\x5e\x65\xdb\x02\x60\x74\x41\xaf\xa8\xa6\x72\xb7\x09\x70\x5e\x3a\xa1\xe3\x47\xe7\x33\x3c\xbb\xb5\x65\x10\x4c\xaf\x9d\x64\x5b\x55\x94\xfb\x88\xfb\xee\x6c\x1a\x78\xe1\xd4\x7f\x13\xdd\x3d\x0e\xd0\xea\x6e\x06\x1b\x2c\x78\xc1\x14\xab\x21\x70\x4c\xcd\x61\x16\xda\xe4\x24\x4c\x43\xa2\x44\x25\x63\xb6\xa9\x4d\xd5\x4b\x18\x17\xbd\x54\x9a\x26\xbd\x58\xe4\xf5\x1c\xf6\x7a\xd6\xa9\x5f\x33\x10\x4c\xcf\xfd\x01\xe6\x30\xeb\x76\x77\x14\x90\xeb\xb7\xb6\x89\xde\x8c\x8f\x69\xf2\x5d\x58\xd0\x6f\x94\x15\x4f\xee\x72\x88\x3c\xe7\x58\xe8\xcb\xf1\x74\x63\x13\xcd\x34\xe3\xde\x1b\xc9\xcc\x59\x82\x07\x84\x93\x66\x76\x99\x10\xcb\xaa\x84\x89\x2b\x32\x9c\x04\x35\x63\xb1\xb8\x5a\x6f\x66\xab\x54\x67\x1d\x9b\xcc\x9f\x09\xe8\xed\xb5\x44\xa9\x67\x7b\x7b\xd7\xd7\xd7\xbd\x8c\x5f\x36\x4b\x22\x64\x8a\x0a\x97\x30\xdd\x04\xff\xe1\x37\x4c\x0f\xb9\xbe\x39\x3f\x40\x24\x98\x58\x6a\x96\xc9\x24\x95\xd4\x25\xcd\x58\xb2\x46\xec\x27\xee\xd0\xf5\x9d\xd0\x1d\x46\x37\xd6\xc0\xba\x68\xea\x76\xbb\x03\x82\x05\x95\x89\xa9\x9a\x5e\x4a\x46\x97\x9b\xba\xe0\x9a\xf4\x99\xe3\x0f\x23\x2c\x87\x3e\xf7\x5d\xe7\x66\xca\xbf\x39\xc7\x53\x8b\xcc\xb9\x3f\x22\x2a\x5e\xb0\x7c\x97\xc5\xa5\x0a\x46\x5a\xd6\x27\xc9\x4c\x8d\x1d\x02\xe3\x71\xcd\x61\xa3\xc9\x75\xc6\xcf\x26\x9d\x94\xeb\x0e\x79\x80\x78\x23\xe5\xfa\xd9\xde\x5e\xe7\x61\x0d\x9c\x68\x5a\xb0\xf5\x3b\x73\x87\xaf\x7b\x96\xf9\x2a\x23\x3a\xf7\x47\x51\x30\x38\x73\xc7\xad\x2a\x5b\xf6\x09\x65\xe4\xcb\xa6\xfa\xcf\x92\x3d\x96\x70\x6d\xf8\x6e\xb3\xf8\x8d\xc5\x63\x12\x8a\xe6\x04\x41\x7d\x72\x0e\xde\x16\xa2\x55\x74\xa5\x6a\x5d\x4f\xb5\x4d\x3a\xb4\xac\xf4\xa6\xfa\x8c\xd5\xbe\xed\xc2\xf3\x9d\x35\x67\xeb\x42\xe5\x54\xea\x55\x09\x56\xeb\xee\x9c\x79\xb0\x69\x74\x7b\x93\x37\xb9\xf3\x13\xdf\x19\x84\xf5\x98\xe8\x44\x87\x4e\x70\xe6\xae\xef\x46\x4e\xe8\xbe\x8e\xb6\x9f\x39\x93\xd3\x91\x3b\x8c\x7e\x70\x3e\x0d\x37\x0f\xad\x0b\x4c\x36\xbc\xdd\xad\xf2\x92\xa5\x55\x46\x25\x79\x50\x88\xa2\x8b\x0d\x1f\xd6\x46\x68\x73\xfc\x50\xc8\x94\x16\xfc\xc7\xf5\xd7\x27\xed\x9c\xc5\xf9\xc8\xf1\xa3\xa9\x7f\xba\x3e\x56\xd3\x92\xf6\x6b\x76\xb9\x10\x62\xf9\xf6\xc6\x8e\x37\x10\xc2\x60\x81\x75\xc4\x5b\xa7\x0a\xd7\x9f\x90\x74\x20\x7a\x82\x70\x40\x65\x34\x5e\xc2\x05\xda\x02\x99\x98\xcb\x22\xd5\x34\x5b\x76\x4c\xfd\x32\xa8\x8b\x33\x36\xc1\xc6\x36\xa9\x9b\xc2\x85\x69\x88\xa7\x9b\x32\x8e\x27\xe4\x0c\xf2\xde\x8a\x0e\x86\xee\xc8\x7b\xe9\xfa\x18\xf2\x4c\xcf\xb1\xfe\x79\x74\x23\x67\x81\x30\x83\x17\x4d\x95\x67\x9d\x4a\xc5\xad\xc3\x2c\x6c\x38\x0a\x6e\x67\x62\xc3\xad\x43\x19\x0b\xae\xd0\x7b\xb4\x7d\x23\x2f\x0c\x08\x29\x69\xca\x00\x9b\x9e\x7a\x93\xd3\x68\x72\x3e\xae\x71\x44\xf3\x21\x45\x06\xc1\xa3\xe6\x45\x8a\x85\x46\x2c\x58\x49\xd5\xb3\x2e\x32\x91\xee\x3e\x64\x46\xb3\x0c\x9a\x19\xb9\xdf\x3e\x55\x96\x89\x74\xaf\x43\x54\x75\xd9\x3a\xfc\xb9\x7d\x02\x76\x50\x6f\x02\xf8\x60\x61\xaa\xb6\x75\xe6\xa0\xde\x0f\xa3\xfb\xcd\x96\x80\x2e\x9e\x2b\x66\x74\xc6\x04\xba\xb5\x62\xe6\x55\xa6\x79\xd9\x1c\xc1\x68\xa0\x5d\x4d\xd6\x46\xe6\x3a\x56\x5d\xf1\xad\x9f\x5a\xc7\xe4\x79\x35\x9f\x33\xd9\x1c\xdf\x03\x9b\xb6\xa0\x45\xc1\x32\x9b\x2c\x19\x2b\x09\xd7\xa0\xb5\x1c\x27\x63\x8e\xe1\x93\x04\xcf\x56\x2c\x0b\x71\x4d\xae\xf1\x70\x34\xbc\xec\x59\xcf\xcf\x4f\x4e\x5c\x3f\x1a\xb9\x13\x5c\x4e\x88\xb5\xdc\x3a\xe0\x0c\x25\x8d\x71\x42\x5e\x31\x17\xf0\xfb\x8a\xca\x02\x7e\x5d\x29\x85\x84\x8b\x13\xaa\x69\xd6\xd9\x5e\x3a\xd3\xcb\x1a\xb9\x2f\x5d\x88\x25\xf1\xd6\x6a\xe2\xc9\x66\xb5\x6a\x6f\x51\x64\x2b\xdc\x9f\x5e\xfd\x1c\xf6\x69\x80\xe5\x20\x8d\x87\x23\xb0\xe8\xb7\x60\x12\x3f\xaf\xaa\x29\xae\x69\xe1\xca\xdc\x24\x04\x0f\x3f\x89\xca\xce\x53\x5b\x26\xed\x66\xca\x9d\x44\x0a\x0d\xfb\xf3\x40\x5d\x03\xd0\x43\x53\xdc\x60\xcb\x3a\x6b\xab\x1e\x62\x9d\x30\xf2\xa7\xa1\xa9\x0f\xdc\x3e\xef\xaf\x58\x8a\x7c\xac\xe5\x8c\x24\x94\xe3\x61\x71\xc7\x1b\xbd\xb9\xd5\xf3\x16\x00\x57\x0b\x3e\x47\xa3\x60\x4e\x4e\x21\x8d\xad\xf5\x3e\x7c\x5a\x1f\xe2\x3b\x20\xdf\xfb\x1e\xdc\xe1\x01\xcc\x36\x4e\x8f\x82\x33\xef\x04\x0f\x81\x3f\xbd\x13\xad\x67\x78\x88\x6b\x7b\x98\x26\xd1\x31\xa9\x11\x3b\xfe\xd7\xd4\xcf\xde\x97\x5c\x22\x24\x5f\x35\xda\x66\x1c\xd5\x83\x84\x65\x4c\x33\x42\xe7\x1a\xab\x04\xef\xb1\xc9\x43\x43\x6b\x5d\xc3\x5e\x1f\x59\x30\x9a\x72\x63\x0f\xf1\xe9\xa7\x6e\xa2\x31\xa1\xe0\xcb\x2d\x3c\xc5\x6f\x19\x1a\xb5\xde\xfd\xda\x54\xcc\x34\xd7\xd9\x4f\x83\x79\x12\xae\xca\x8c\xae\x4c\x1d\xbc\x9d\x97\x34\x25\xbb\x3a\xa7\xb3\x5d\x92\xad\xf9\x79\x2f\x64\xfe\x76\x93\xfa\xc7\xb5\x42\x01\xe3\xa2\xb0\x6e\x4a\x81\x6f\x24\xcf\x9c\x0b\x4a\xe8\xaa\x6e\x10\xa1\xcc\xdc\x6a\x26\x8a\xb8\x81\xd7\x20\x31\xec\x7d\x8c\x85\x06\xf2\x9e\x8c\x9f\xb7\x83\x35\xa3\xdc\xe3\x7a\xef\x71\xe7\xb4\x30\xe6\xc2\x18\x4b\x23\xa0\xed\x9d\x7a\x54\x73\x9f\xd6\xdc\xef\x80\xa8\xed\x89\xf4\x6e\xcd\xa4\x5d\x31\x31\xdc\x1a\x38\xd3\xcc\xac\x77\xc7\xd4\xda\x52\xba\x99\x1a\x06\xa0\xe4\x92\xcd\x21\xd4\x28\xd8\x7b\x5d\x13\xed\xdd\x9e\x66\x9b\xc0\xd6\x54\x71\x8e\xbd\x9b\x93\x8c\xa5\x49\x12\xd7\xdb\xd3\x7c\xc5\x09\x8f\x89\xa6\x6a\x89\x91\x2c\x17\x89\xc9\xc8\xef\x08\xde\xfd\xaa\x68\xb7\x36\x20\x58\xa4\xca\x1c\xeb\x52\xe6\x83\xce\x5b\xa7\xe9\xc1\x29\xe0\x07\x59\x24\xc7\x53\x7f\xca\x70\xd2\x33\x5f\x69\x45\xf5\xc3\xb7\x16\x60\xc3\xe1\x39\xd6\x13\xbf\x6f\xd6\xee\x60\x1f\xab\x88\xfe\x26\xde\x5a\x30\x9a\xe9\x85\xf9\x02\xa1\x26\x03\x11\x54\x64\x9e\x47\xf8\x7c\x17\xa5\xc3\xc7\x0b\x6b\xe3\xd5\x9f\xec\x43\xac\xe5\xc8\xb4\xda\xe4\x2c\xd0\x67\x15\x09\xf9\x4e\xca\x35\x99\xab\x78\xf9\x9d\xc6\x4b\x75\xbb\x55\x21\xc1\x37\xe3\xaa\x75\xbb\x9a\xa6\xaa\x63\x1d\x63\xa8\x81\x21\xae\x28\xd6\x41\x2c\xd7\x5d\x15\xe7\x18\x7d\x25\x22\x56\xf8\x00\x88\xed\x1d\xf4\x3e\xef\x1d\x59\x8e\x7f\x1a\x18\xe3\x3e\xc0\x6f\x28\x5a\x91\x24\x7e\xb0\xa5\x34\x8f\x9b\xe5\xc1\xb9\x44\x38\x3b\x78\xa7\xde\xde\x5c\x5d\xdc\x94\xdd\x53\x85\x01\x32\x46\x8b\xaa\xdc\x0a\x56\x65\xbc\xe0\x57\x4c\xb5\x17\xae\x7e\x16\xc5\xa6\xf9\xad\x41\xcc\x16\xee\x1e\xe5\x98\x84\x3c\x67\x9b\xf2\xe3\xfa\xd3\x10\x3e\x6f\xc6\x6a\x61\x78\x1c\x81\x25\xd6\x74\x34\x04\x88\x75\xe6\x80\x2f\x46\x66\x2f\x52\x8e\x09\xa6\xa1\xc1\xa2\x8a\x2c\x78\xba\xc8\x78\xba\x30\xdf\x23\xe0\x57\x56\xb0\x35\x92\xe5\xe2\xca\x9c\x3b\x2f\x52\xa6\xd6\x00\x74\xe8\x9d\x9c\x44\x67\xde\xe9\xd9\xc8\x3b\x3d\x6b\x97\x8d\xc7\xf4\xfd\xad\x64\x8d\x5a\x88\x6b\x44\x5b\x09\x9f\xcf\xc9\x15\x67\xd7\xa8\x26\xa7\x5e\x68\xe8\x6c\x92\x37\xfb\xb7\x28\x18\x07\xd2\x04\x4f\xc0\x5b\xdb\x95\xdc\x43\xb4\xed\x5f\x6e\x51\x8d\x17\x54\xd2\x18\xab\xc9\x48\x32\x6b\x7f\xdb\x70\x3f\x4d\x3c\x74\xef\x0c\x42\xf3\xb1\xc5\xa1\xa1\x7e\x8f\x5c\xa7\x71\x4b\xaa\x69\x9a\xe2\x67\x78\x57\x20\xd4\x80\x0a\xfe\x3e\x42\x9d\xc6\xb5\x48\x9f\x0e\xa2\x8d\x54\x4f\xd7\x27\x2f\x6e\xc3\x6b\xdc\xe6\x5e\xfd\xfc\xad\x65\x8e\x7d\xbb\xa8\x8d\xfb\xd6\xd8\xf3\xfd\xa9\x6f\xbe\x1a\xb6\x06\xa3\xe9\xc4\xad\xaf\x67\xe7\xa3\x51\x7d\x79\x3a\x30\x59\x7b\xeb\xc2\x98\x8c\xf5\x61\xc9\x06\x27\xb4\x12\xfe\x0b\x51\xd5\x25\x44\x3c\x83\x0d\x66\xce\x98\x1b\x44\xf9\x27\xce\xf9\x28\x6c\xd7\x48\x9e\x42\x74\x54\xf2\xb7\xb7\xf6\x86\x6b\x96\x2b\x93\x1b\x30\xdf\x33\x99\x74\x00\x45\x98\x8e\xfb\x61\xfe\xfa\x40\xe0\x46\x5e\xe8\x8e\x31\x81\x0a\x1c\x56\x48\x6b\xb2\xfb\x2b\x85\x75\x18\x0e\xb2\x68\xf6\x58\x14\x08\x37\x32\x58\x79\x24\xed\xbe\x9e\x8d\xa6\xbe\x1b\x6d\x05\x02\x87\xfb\x5b\x44\xb9\x52\xd5\xdd\xe4\x90\x8c\x17\x04\xe7\x37\x88\x1c\x6c\x13\x69\xfc\x07\xc8\x09\xd7\xea\x06\x11\x3c\x9a\xc0\xf5\x8a\xcc\x19\x4b\xac\x13\xd7\x1d\xe2\x91\x57\x73\x64\xbc\x26\x78\xd4\x24\x2b\x81\x5c\x47\x2f\x58\xce\xba\xb1\xc8\x84\xec\x90\x9c\x69\x4a\x34\x4d\x6d\x53\x6a\xbd\x5c\x11\xa7\x48\xa4\xe0\x09\xf9\xcd\x3e\x39\xc2\x0f\x9a\x1c\x50\x46\x73\x8e\x01\x3b\x91\x8c\x2f\x19\xe9\x14\xa2\xa8\x4f\x86\x36\x27\x46\xcd\x2e\x98\x32\x7a\x6b\xd7\x95\x5e\x61\xac\x30\x6e\x92\x8d\xcf\xd6\xf9\x9f\x84\x5d\xb1\x4c\x94\x10\x20\xa5\x42\xa4\xe6\xc4\xd2\xde\x35\xbb\xdc\xab\x65\x61\xef\x70\xff\xe0\xf1\xde\xc1\xc1\x5e\x60\x8e\x7d\x74\xe7\x42\x76\x5b\x13\xe8\xf2\xa2\x3b\x58\x48\x91\xb3\xee\xa3\x2f\xf0\x65\xcd\xbe\x15\x9e\xb9\x63\x37\x1a\x4c\x47\x53\x3f\x1a\xbb\xa1\x13\x85\xce\x29\xe9\x93\x77\xdf\x9a\xcf\x8f\x1e\x3d\x7e\xf4\xae\x16\xa4\xc6\xa1\x5f\xae\xb4\x41\x9e\xc6\x06\xdd\x04\x5a\x0f\x5a\x50\xf7\xe9\xf8\xf9\x43\xe3\xb8\xbd\x60\x36\x72\xcc\x11\x9b\xc6\xed\x3f\x7d\xf4\xf4\xe9\x93\xfd\xa7\x28\x60\xbd\x75\x38\xbf\xd9\xcc\x3a\x84\xbe\x47\x20\x00\xc2\x6d\xcb\xc3\xd1\xfe\x6d\x49\xbd\x97\x84\xef\xce\xa6\xf7\x92\x00\xd0\x18\x7f\x83\x60\x4e\xa6\xa1\x37\xb8\x29\xde\x47\x5b\x64\xda\xe9\x86\x7b\x69\x4d\xfd\xd3\x5b\xfc\xe0\x0a\x35\x55\xf7\x7f\xd8\xec\x0e\xb6\xd9\x2a\xd8\xb5\x42\x75\xf8\x86\x09\xba\xaf\x82\x08\x15\xe6\x3e\x15\x6e\xb4\xee\x3e\x4a\xcd\xf7\x19\x5b\x74\xf0\x1c\x71\x09\xa2\xa9\x17\xac\xba\x23\xcb\x34\x5b\xbf\x07\x4d\x94\x3c\xde\x55\x91\xb9\xdd\x0d\x8f\x48\x3c\xa7\x8a\xc7\xc4\xd9\x3e\xfc\x81\xe5\x42\xa1\x59\xac\x1b\x82\x75\xc9\xb9\xce\x4c\x3e\x77\x02\x6f\x80\xa7\x22\x6e\xe4\x3e\xb6\x4e\x58\xdc\x49\xbf\x67\x6d\x08\xb4\x4e\xdc\xae\x93\xf0\xf5\xa1\xa6\x4f\xa7\xb1\x7d\x5e\xd0\x5d\x27\xfb\x72\x5a\x96\x78\x00\x48\xb4\xb0\x46\x9c\x51\x05\xb8\x10\xfd\x63\x4f\x8b\x3c\xeb\xf3\x82\x5b\x17\xeb\x16\xbd\xba\xdb\x5b\xcb\xba\xe0\x07\x4f\x8b\xb7\xd6\xc8\x99\x80\xeb\x23\xac\xe8\x9e\x07\xf6\x8f\x17\xdd\xc1\x04\xfe\x3d\x7b\x01\xff\x86\xaf\xec\x84\x75\x87\xae\x3d\x97\xdd\x13\xdf\x2e\xb2\xee\x64\x64\x67\x57\xdd\xd1\x4b\x5b\x56\x5d\xff\xdc\xfe\x21\xed\xfe\xd6\xcc\x66\xaa\xeb\x06\x76\xa9\xbb\xcf\x7d\xbb\xcc\xba\xb3\x91\x7d\x99\x76\x9f\x9f\xda\x5c\x77\xbd\xd0\x9e\xf3\xee\x89\x67\x6b\xd9\x0d\x7d\x3b\x56\xdd\xc1\x97\xb6\x92\xdd\x60\x66\xab\xab\x6e\xe0\xda\x4b\xd1\x7d\xe1\xdb\x69\x06\x14\xaa\x65\xf7\xdc\xb1\x59\xd1\x3d\x7d\x6e\x2f\xaa\xee\xd9\xb9\xad\x96\xdd\xe0\x85\xcd\x93\xae\x37\xb4\xe7\xb4\xeb\xf9\xf6\x15\xef\xbe\x9c\xc0\x58\xb3\x10\xcf\xf2\x03\xef\x6e\x91\x66\x5c\x2d\xec\x5f\xfd\x97\x9f\xfc\xf5\x5f\xfc\xab\xbf\xfe\xd9\x9f\xfe\xf2\xf7\x7f\xd7\xfe\xd5\x9f\x7f\xf5\xb7\xff\xe9\x5f\x9b\x9b\xbf\xfb\xc5\x3f\xfb\xdb\xff\xf8\x6f\x7f\xf9\xb3\xff\xfa\x77\xbf\xf8\xe7\x37\x5f\xfc\xcd\xef\xfe\xfc\x57\x5f\xfd\x7b\x78\x31\x64\x95\x56\xf1\xc2\x9e\x4b\x5a\x7c\xfd\xc7\x94\x2b\x7b\xc2\x12\x26\x33\x5a\x24\xca\xce\xa8\xbe\xe2\xec\xaf\xfe\xa8\xb2\x3f\xfe\xe4\xe3\xef\x7c\xfc\xea\xe3\x57\x1f\x7e\xfe\xe1\x67\x1f\xfe\xdc\xfe\xe5\x1f\xfc\x87\x5f\xfe\xe1\x7f\xfe\x9b\x3f\xf9\x77\x36\x53\x25\xfd\xfa\xcf\x44\x66\x83\x21\xae\xd2\xea\xeb\x3f\x51\x24\x11\xe4\xb9\xa4\x8a\xc3\xc3\x4c\x2d\xb9\xfd\xe1\xcf\x3e\xfe\x8b\x0f\xff\xf3\xc3\x7f\xfb\xf0\xd3\x8f\x3f\x31\x34\x6c\xae\x69\xc6\x69\x21\x6c\x55\x89\x9c\xdb\xe1\xd7\xbf\x90\xcb\xaf\xff\x98\xd9\x7f\xf9\x7b\xec\xaf\xfe\x48\xf3\x82\xda\x1f\xbf\xfa\xf8\x93\x0f\xff\xab\x6e\xae\xae\x58\xa1\x96\xd4\xfe\xbf\xff\xe6\x0f\xff\xf7\xff\xf8\xd3\xff\xf3\xfb\xff\xdd\x4e\x69\xc6\x52\x61\x7f\xfc\x9d\x0f\x3f\xff\xf8\x93\x0f\x3f\xfd\xf8\x07\x1f\xfe\xe2\xe3\x57\x1f\xff\xe5\x87\x9f\x7f\xf8\xa9\x5d\xaf\x0d\x79\x70\x5e\x60\xde\xf9\x05\x2f\xd2\x44\xe4\x0f\xed\x31\x4d\x57\x54\xda\x41\x26\xae\x58\xf1\x97\xbf\x07\xc3\x78\x45\x22\x0a\xa6\x38\x2d\xec\x19\x93\xf8\xfb\x92\x33\x3c\x42\xaa\x98\x3d\x5b\xcf\xca\x32\x49\x32\x23\xc6\xe0\x86\x00\x12\x95\x3c\x5e\x32\x69\xc4\xaa\x07\x0f\x33\x0a\x72\x86\x72\x85\xf2\x65\xa1\x70\x91\x3e\xf9\xf1\xc2\x42\x09\xc3\xcb\x6e\xf8\xca\xc2\x7f\xd7\x77\x28\x71\xf8\xf7\x74\x2c\x14\x3b\xd0\x43\x69\xa1\xec\x91\x3e\x29\x32\x0b\x05\x90\xf4\x49\x76\x65\xa1\x14\x92\x3e\x91\x95\x85\xa2\x48\xfa\xe4\x87\xd4\x42\x79\x84\x31\x95\x85\x42\x49\xfa\x04\x7f\x2d\x14\x4e\xb8\xcb\x2c\x94\x50\xd2\x27\x97\xa9\x85\x62\x4a\xfa\x84\x6b\x0b\x65\x15\x06\xe4\x16\x0a\x2c\xda\x18\x0b\xa5\x96\xf4\x09\xfe\x5a\x28\xbd\xa4\x4f\x94\xb4\x50\x84\xe1\xf2\xca\x42\x39\x26\x7d\xb2\x14\x16\x0a\x33\xe9\x93\x34\xb3\x50\xa2\x49\x9f\x54\x4b\x0b\xc5\xda\x28\xda\xe9\x73\x0b\xc5\x9b\xf4\xc9\xa2\xb2\x50\xc6\x81\xc8\xd2\x42\x41\x07\x4e\x12\x0b\xa5\x1d\x4d\x90\x85\x22\x4f\xfa\xe4\x8a\x5b\x28\xf7\x38\x1d\xcb\xba\xc0\x3f\x8e\xf4\xd6\x0a\xce\xa6\xaf\xa2\x93\xe9\x34\x74\xfd\x08\x33\x1a\xde\xe4\xb4\x65\xbb\x02\xfc\x24\x83\xd7\x7f\xed\xa9\xfe\xeb\x10\x84\xbd\x67\x71\xd5\x64\x6d\x4d\x39\x53\x68\x26\xb7\x88\x85\xee\x78\x36\x82\xa0\x1f\x4b\x7e\xf5\x21\x1a\x34\xb9\xff\x2f\x00\x00\xff\xff\x50\x75\x46\x60\xf6\x4a\x00\x00" func confAppIniBytes() ([]byte, error) { return bindataRead( @@ -324,8 +324,8 @@ func confAppIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/app.ini", size: 18756, mode: os.FileMode(0644), modTime: time.Unix(1585501633, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x5, 0xf4, 0x94, 0xf6, 0xab, 0x5c, 0xeb, 0x3, 0x9, 0x8c, 0x61, 0x6, 0x6f, 0xa2, 0xd9, 0x7c, 0x2, 0x1d, 0x69, 0x1a, 0x2c, 0x63, 0x65, 0x58, 0xed, 0x43, 0xd1, 0x15, 0xd4, 0x34, 0x67, 0x9a}} + info := bindataFileInfo{name: "conf/app.ini", size: 19190, mode: os.FileMode(0644), modTime: time.Unix(1585995604, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x3c, 0xc5, 0x6e, 0xc2, 0x3e, 0xb8, 0x45, 0xa2, 0x3d, 0x72, 0x74, 0x63, 0x47, 0xc7, 0x3d, 0x51, 0x9e, 0xdc, 0x49, 0x58, 0x55, 0x79, 0x2d, 0xee, 0x5b, 0xd9, 0x3d, 0x4b, 0xea, 0x90, 0x88, 0x99}} return a, nil } @@ -4544,7 +4544,7 @@ func confLocaleLocale_deDeIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/locale_de-DE.ini", size: 74045, mode: os.FileMode(0644), modTime: time.Unix(1585501649, 0)} + info := bindataFileInfo{name: "conf/locale/locale_de-DE.ini", size: 74045, mode: os.FileMode(0644), modTime: time.Unix(1585851305, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x3a, 0xda, 0x18, 0xc2, 0x47, 0x31, 0x61, 0x9c, 0x3, 0x64, 0xc3, 0xec, 0xe0, 0xca, 0xf4, 0x5a, 0x1f, 0xe3, 0xa9, 0xe3, 0xc5, 0x1c, 0x5a, 0xa9, 0x9e, 0x8d, 0x13, 0x64, 0xe0, 0x60, 0xcf, 0x25}} return a, nil } @@ -5044,7 +5044,7 @@ func confLocaleLocale_zhCnIni() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "conf/locale/locale_zh-CN.ini", size: 65603, mode: os.FileMode(0644), modTime: time.Unix(1585501649, 0)} + info := bindataFileInfo{name: "conf/locale/locale_zh-CN.ini", size: 65603, mode: os.FileMode(0644), modTime: time.Unix(1585851305, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x31, 0xfe, 0x6a, 0x11, 0xc3, 0x85, 0x4a, 0xf1, 0xa4, 0xe2, 0xbf, 0xb2, 0x82, 0xd3, 0x9f, 0x5b, 0x40, 0x57, 0x6b, 0x16, 0x9b, 0x7c, 0xdb, 0xf, 0xfa, 0xc1, 0x36, 0x5e, 0x57, 0xcc, 0x4d, 0x4f}} return a, nil } diff --git a/internal/assets/public/public_gen.go b/internal/assets/public/public_gen.go index caf9f157..97409807 100644 --- a/internal/assets/public/public_gen.go +++ b/internal/assets/public/public_gen.go @@ -19922,7 +19922,7 @@ func jsGogsJs() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "js/gogs.js", size: 47683, mode: os.FileMode(0644), modTime: time.Unix(1585391597, 0)} + info := bindataFileInfo{name: "js/gogs.js", size: 47683, mode: os.FileMode(0644), modTime: time.Unix(1585394288, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x45, 0x65, 0x98, 0x95, 0x98, 0xb5, 0x1, 0xee, 0x42, 0xf2, 0x3a, 0xc2, 0x75, 0xd2, 0x72, 0x86, 0xb7, 0xa3, 0x83, 0x6c, 0x24, 0x8f, 0x7, 0x22, 0x8c, 0xc3, 0xea, 0x4e, 0x7a, 0x74, 0x64, 0xd8}} return a, nil } diff --git a/internal/auth/auth.go b/internal/auth/auth.go index 05751c05..43d7f2e5 100644 --- a/internal/auth/auth.go +++ b/internal/auth/auth.go @@ -48,18 +48,18 @@ func SignedInID(c *macaron.Context, sess session.Store) (_ int64, isTokenAuth bo // Let's see if token is valid. if len(tokenSHA) > 0 { - t, err := db.GetAccessTokenBySHA(tokenSHA) + t, err := db.AccessTokens.GetBySHA(tokenSHA) if err != nil { - if !db.IsErrAccessTokenNotExist(err) && !db.IsErrAccessTokenEmpty(err) { + if !db.IsErrAccessTokenNotExist(err) { log.Error("GetAccessTokenBySHA: %v", err) } return 0, false } t.Updated = time.Now() - if err = db.UpdateAccessToken(t); err != nil { + if err = db.AccessTokens.Save(t); err != nil { log.Error("UpdateAccessToken: %v", err) } - return t.UID, true + return t.UserID, true } } @@ -90,7 +90,7 @@ func SignedInUser(ctx *macaron.Context, sess session.Store) (_ *db.User, isBasic if uid <= 0 { if conf.Auth.EnableReverseProxyAuthentication { - webAuthUser := ctx.Req.Header.Get(conf.Security.ReverseProxyAuthenticationUser) + webAuthUser := ctx.Req.Header.Get(conf.Auth.ReverseProxyAuthenticationHeader) if len(webAuthUser) > 0 { u, err := db.GetUserByName(webAuthUser) if err != nil { @@ -127,7 +127,7 @@ func SignedInUser(ctx *macaron.Context, sess session.Store) (_ *db.User, isBasic if len(auths) == 2 && auths[0] == "Basic" { uname, passwd, _ := tool.BasicAuthDecode(auths[1]) - u, err := db.UserLogin(uname, passwd, -1) + u, err := db.Users.Authenticate(uname, passwd, -1) if err != nil { if !db.IsErrUserNotExist(err) { log.Error("Failed to authenticate user: %v", err) diff --git a/internal/authutil/basic.go b/internal/authutil/basic.go new file mode 100644 index 00000000..891cf762 --- /dev/null +++ b/internal/authutil/basic.go @@ -0,0 +1,35 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package authutil + +import ( + "encoding/base64" + "net/http" + "strings" +) + +// DecodeBasic extracts username and password from given header using HTTP Basic Auth. +// It returns empty strings if values are not presented or not valid. +func DecodeBasic(header http.Header) (username, password string) { + if len(header) == 0 { + return "", "" + } + + fields := strings.Fields(header.Get("Authorization")) + if len(fields) != 2 || fields[0] != "Basic" { + return "", "" + } + + p, err := base64.StdEncoding.DecodeString(fields[1]) + if err != nil { + return "", "" + } + + creds := strings.SplitN(string(p), ":", 2) + if len(creds) == 1 { + return creds[0], "" + } + return creds[0], creds[1] +} diff --git a/internal/authutil/basic_test.go b/internal/authutil/basic_test.go new file mode 100644 index 00000000..6e744e55 --- /dev/null +++ b/internal/authutil/basic_test.go @@ -0,0 +1,72 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package authutil + +import ( + "net/http" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestDecodeBasic(t *testing.T) { + tests := []struct { + name string + header http.Header + expUsername string + expPassword string + }{ + { + name: "no header", + }, + { + name: "no authorization", + header: http.Header{ + "Content-Type": []string{"text/plain"}, + }, + }, + { + name: "malformed value", + header: http.Header{ + "Authorization": []string{"Basic"}, + }, + }, + { + name: "not basic", + header: http.Header{ + "Authorization": []string{"Digest dummy"}, + }, + }, + { + name: "bad encoding", + header: http.Header{ + "Authorization": []string{"Basic not_base64"}, + }, + }, + + { + name: "only has username", + header: http.Header{ + "Authorization": []string{"Basic dXNlcm5hbWU="}, + }, + expUsername: "username", + }, + { + name: "has username and password", + header: http.Header{ + "Authorization": []string{"Basic dXNlcm5hbWU6cGFzc3dvcmQ="}, + }, + expUsername: "username", + expPassword: "password", + }, + } + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + username, password := DecodeBasic(test.header) + assert.Equal(t, test.expUsername, username) + assert.Equal(t, test.expPassword, password) + }) + } +} diff --git a/internal/cmd/serv.go b/internal/cmd/serv.go index 8c6349e3..40f0852d 100644 --- a/internal/cmd/serv.go +++ b/internal/cmd/serv.go @@ -126,9 +126,9 @@ func checkDeployKey(key *db.PublicKey, repo *db.Repository) { var ( allowedCommands = map[string]db.AccessMode{ - "git-upload-pack": db.ACCESS_MODE_READ, - "git-upload-archive": db.ACCESS_MODE_READ, - "git-receive-pack": db.ACCESS_MODE_WRITE, + "git-upload-pack": db.AccessModeRead, + "git-upload-archive": db.AccessModeRead, + "git-receive-pack": db.AccessModeWrite, } ) @@ -184,7 +184,7 @@ func runServ(c *cli.Context) error { } // Prohibit push to mirror repositories. - if requestMode > db.ACCESS_MODE_READ && repo.IsMirror { + if requestMode > db.AccessModeRead && repo.IsMirror { fail("Mirror repository is read-only", "") } @@ -196,7 +196,7 @@ func runServ(c *cli.Context) error { fail("Invalid key ID", "Invalid key ID '%s': %v", c.Args()[0], err) } - if requestMode == db.ACCESS_MODE_WRITE || repo.IsPrivate { + if requestMode == db.AccessModeWrite || repo.IsPrivate { // Check deploy key or user key. if key.IsDeployKey() { if key.Mode < requestMode { @@ -216,7 +216,7 @@ func runServ(c *cli.Context) error { if mode < requestMode { clientMessage := _ACCESS_DENIED_MESSAGE - if mode >= db.ACCESS_MODE_READ { + if mode >= db.AccessModeRead { clientMessage = "You do not have sufficient authorization for this action" } fail(clientMessage, @@ -259,7 +259,7 @@ func runServ(c *cli.Context) error { } else { gitCmd = exec.Command(verb, repoFullName) } - if requestMode == db.ACCESS_MODE_WRITE { + if requestMode == db.AccessModeWrite { gitCmd.Env = append(os.Environ(), db.ComposeHookEnvs(db.ComposeHookEnvsOptions{ AuthUser: user, OwnerName: owner.Name, diff --git a/internal/cmd/web.go b/internal/cmd/web.go index 84c99184..f26c5a51 100644 --- a/internal/cmd/web.go +++ b/internal/cmd/web.go @@ -41,6 +41,7 @@ import ( "gogs.io/gogs/internal/route/admin" apiv1 "gogs.io/gogs/internal/route/api/v1" "gogs.io/gogs/internal/route/dev" + "gogs.io/gogs/internal/route/lfs" "gogs.io/gogs/internal/route/org" "gogs.io/gogs/internal/route/repo" "gogs.io/gogs/internal/route/user" @@ -648,11 +649,14 @@ func runWeb(c *cli.Context) error { // e.g. with or without ".git" suffix. m.Group("/:reponame([\\d\\w-_\\.]+\\.git$)", func() { m.Get("", ignSignIn, context.RepoAssignment(), context.RepoRef(), repo.Home) - m.Options("/*", ignSignInAndCsrf, repo.HTTPContexter(), repo.HTTP) - m.Route("/*", "GET,POST", ignSignInAndCsrf, repo.HTTPContexter(), repo.HTTP) + + m.Group("/info/lfs", func() { + lfs.RegisterRoutes(m.Router) + }, ignSignInAndCsrf) + + m.Route("/*", "GET,POST,OPTIONS", ignSignInAndCsrf, repo.HTTPContexter(), repo.HTTP) }) - m.Options("/:reponame/*", ignSignInAndCsrf, repo.HTTPContexter(), repo.HTTP) - m.Route("/:reponame/*", "GET,POST", ignSignInAndCsrf, repo.HTTPContexter(), repo.HTTP) + m.Route("/:reponame/*", "GET,POST,OPTIONS", ignSignInAndCsrf, repo.HTTPContexter(), repo.HTTP) }) // ***** END: Repository ***** diff --git a/internal/conf/conf.go b/internal/conf/conf.go index f44e302d..0f685483 100644 --- a/internal/conf/conf.go +++ b/internal/conf/conf.go @@ -365,6 +365,8 @@ func Init(customConf string) error { return errors.Wrap(err, "mapping [cache] section") } else if err = File.Section("http").MapTo(&HTTP); err != nil { return errors.Wrap(err, "mapping [http] section") + } else if err = File.Section("lfs").MapTo(&LFS); err != nil { + return errors.Wrap(err, "mapping [lfs] section") } else if err = File.Section("release").MapTo(&Release); err != nil { return errors.Wrap(err, "mapping [release] section") } else if err = File.Section("webhook").MapTo(&Webhook); err != nil { diff --git a/internal/conf/static.go b/internal/conf/static.go index b9c3dfd8..8daebe79 100644 --- a/internal/conf/static.go +++ b/internal/conf/static.go @@ -128,20 +128,7 @@ var ( } // Database settings - Database struct { - Type string - Host string - Name string - User string - Password string - SSLMode string `ini:"SSL_MODE"` - Path string - - // Deprecated: Use Type instead, will be removed in 0.13. - DbType string - // Deprecated: Use Password instead, will be removed in 0.13. - Passwd string - } + Database DatabaseOpts // Security settings Security struct { @@ -243,6 +230,11 @@ var ( AccessControlAllowOrigin string } + // LFS settings + LFS struct { + ObjectsPath string + } + // Attachment settings Attachment struct { Enabled bool @@ -252,7 +244,7 @@ var ( MaxFiles int } - // Release settigns + // Release settings Release struct { Attachment struct { Enabled bool @@ -298,7 +290,7 @@ var ( PagingNum int } - // Markdown sttings + // Markdown settings Markdown struct { EnableHardLineBreak bool CustomURLSchemes []string `ini:"CUSTOM_URL_SCHEMES"` @@ -409,6 +401,23 @@ var ( HasRobotsTxt bool ) +type DatabaseOpts struct { + Type string + Host string + Name string + User string + Password string + SSLMode string `ini:"SSL_MODE"` + Path string + MaxOpenConns int + MaxIdleConns int + + // Deprecated: Use Type instead, will be removed in 0.13. + DbType string + // Deprecated: Use Password instead, will be removed in 0.13. + Passwd string +} + type i18nConf struct { Langs []string `delim:","` Names []string `delim:","` diff --git a/internal/conf/testdata/TestInit.golden.ini b/internal/conf/testdata/TestInit.golden.ini index b08b90e1..e5a8d066 100644 --- a/internal/conf/testdata/TestInit.golden.ini +++ b/internal/conf/testdata/TestInit.golden.ini @@ -66,6 +66,8 @@ USER=gogs PASSWORD=12345678 SSL_MODE=disable PATH=/tmp/gogs.db +MAX_OPEN_CONNS=30 +MAX_IDLE_CONNS=30 DB_TYPE= PASSWD= diff --git a/internal/context/org.go b/internal/context/org.go index 6ed35835..c56bca53 100644 --- a/internal/context/org.go +++ b/internal/context/org.go @@ -133,7 +133,7 @@ func HandleOrgAssignment(c *Context, args ...bool) { return } - c.Org.IsTeamAdmin = c.Org.Team.IsOwnerTeam() || c.Org.Team.Authorize >= db.ACCESS_MODE_ADMIN + c.Org.IsTeamAdmin = c.Org.Team.IsOwnerTeam() || c.Org.Team.Authorize >= db.AccessModeAdmin c.Data["IsTeamAdmin"] = c.Org.IsTeamAdmin if requireTeamAdmin && !c.Org.IsTeamAdmin { c.NotFound() diff --git a/internal/context/repo.go b/internal/context/repo.go index f2cac277..871b35bc 100644 --- a/internal/context/repo.go +++ b/internal/context/repo.go @@ -52,22 +52,22 @@ type Repository struct { // IsOwner returns true if current user is the owner of repository. func (r *Repository) IsOwner() bool { - return r.AccessMode >= db.ACCESS_MODE_OWNER + return r.AccessMode >= db.AccessModeOwner } // IsAdmin returns true if current user has admin or higher access of repository. func (r *Repository) IsAdmin() bool { - return r.AccessMode >= db.ACCESS_MODE_ADMIN + return r.AccessMode >= db.AccessModeAdmin } // IsWriter returns true if current user has write or higher access of repository. func (r *Repository) IsWriter() bool { - return r.AccessMode >= db.ACCESS_MODE_WRITE + return r.AccessMode >= db.AccessModeWrite } // HasAccess returns true if the current user has at least read access for this repository func (r *Repository) HasAccess() bool { - return r.AccessMode >= db.ACCESS_MODE_READ + return r.AccessMode >= db.AccessModeRead } // CanEnableEditor returns true if repository is editable and user has proper access level. @@ -168,7 +168,7 @@ func RepoAssignment(pages ...bool) macaron.Handler { // Admin has super access. if c.IsLogged && c.User.IsAdmin { - c.Repo.AccessMode = db.ACCESS_MODE_OWNER + c.Repo.AccessMode = db.AccessModeOwner } else { mode, err := db.UserAccessMode(c.UserID(), repo) if err != nil { @@ -179,7 +179,7 @@ func RepoAssignment(pages ...bool) macaron.Handler { } // Check access - if c.Repo.AccessMode == db.ACCESS_MODE_NONE { + if c.Repo.AccessMode == db.AccessModeNone { // Redirect to any accessible page if not yet on it if repo.IsPartialPublic() && (!(isIssuesPage || isWikiPage) || diff --git a/internal/db/access.go b/internal/db/access.go index 63911f8e..551c29d7 100644 --- a/internal/db/access.go +++ b/internal/db/access.go @@ -13,22 +13,22 @@ import ( type AccessMode int const ( - ACCESS_MODE_NONE AccessMode = iota // 0 - ACCESS_MODE_READ // 1 - ACCESS_MODE_WRITE // 2 - ACCESS_MODE_ADMIN // 3 - ACCESS_MODE_OWNER // 4 + AccessModeNone AccessMode = iota // 0 + AccessModeRead // 1 + AccessModeWrite // 2 + AccessModeAdmin // 3 + AccessModeOwner // 4 ) func (mode AccessMode) String() string { switch mode { - case ACCESS_MODE_READ: + case AccessModeRead: return "read" - case ACCESS_MODE_WRITE: + case AccessModeWrite: return "write" - case ACCESS_MODE_ADMIN: + case AccessModeAdmin: return "admin" - case ACCESS_MODE_OWNER: + case AccessModeOwner: return "owner" default: return "none" @@ -39,15 +39,15 @@ func (mode AccessMode) String() string { func ParseAccessMode(permission string) AccessMode { switch permission { case "write": - return ACCESS_MODE_WRITE + return AccessModeWrite case "admin": - return ACCESS_MODE_ADMIN + return AccessModeAdmin default: - return ACCESS_MODE_READ + return AccessModeRead } } -// Access represents the highest access level of a user to the repository. The only access type +// Access represents the highest access level of a user to a repository. The only access type // that is not in this table is the real owner of a repository. In case of an organization // repository, the members of the owners team are in this table. type Access struct { @@ -58,10 +58,10 @@ type Access struct { } func userAccessMode(e Engine, userID int64, repo *Repository) (AccessMode, error) { - mode := ACCESS_MODE_NONE + mode := AccessModeNone // Everyone has read access to public repository if !repo.IsPrivate { - mode = ACCESS_MODE_READ + mode = AccessModeRead } if userID <= 0 { @@ -69,7 +69,7 @@ func userAccessMode(e Engine, userID int64, repo *Repository) (AccessMode, error } if userID == repo.OwnerID { - return ACCESS_MODE_OWNER, nil + return AccessModeOwner, nil } access := &Access{ @@ -93,6 +93,7 @@ func hasAccess(e Engine, userID int64, repo *Repository, testMode AccessMode) (b } // HasAccess returns true if someone has the request access level. User can be nil! +// Deprecated: Use Perms.HasAccess instead. func HasAccess(userID int64, repo *Repository, testMode AccessMode) (bool, error) { return hasAccess(x, userID, repo, testMode) } @@ -136,7 +137,7 @@ func (user *User) GetAccessibleRepositories(limit int) (repos []*Repository, _ e } func maxAccessMode(modes ...AccessMode) AccessMode { - max := ACCESS_MODE_NONE + max := AccessModeNone for _, mode := range modes { if mode > max { max = mode @@ -205,7 +206,7 @@ func (repo *Repository) recalculateTeamAccesses(e Engine, ignTeamID int64) (err // Owner team gets owner access, and skip for teams that do not // have relations with repository. if t.IsOwnerTeam() { - t.Authorize = ACCESS_MODE_OWNER + t.Authorize = AccessModeOwner } else if !t.hasRepository(e, repo.ID) { continue } diff --git a/internal/db/access_tokens.go b/internal/db/access_tokens.go new file mode 100644 index 00000000..ad5e6c7a --- /dev/null +++ b/internal/db/access_tokens.go @@ -0,0 +1,65 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package db + +import ( + "fmt" + + "github.com/jinzhu/gorm" + + "gogs.io/gogs/internal/errutil" +) + +// AccessTokensStore is the persistent interface for access tokens. +// +// NOTE: All methods are sorted in alphabetical order. +type AccessTokensStore interface { + // GetBySHA returns the access token with given SHA1. + // It returns ErrAccessTokenNotExist when not found. + GetBySHA(sha string) (*AccessToken, error) + // Save persists all values of given access token. + Save(t *AccessToken) error +} + +var AccessTokens AccessTokensStore + +type accessTokens struct { + *gorm.DB +} + +var _ errutil.NotFound = (*ErrAccessTokenNotExist)(nil) + +type ErrAccessTokenNotExist struct { + args errutil.Args +} + +func IsErrAccessTokenNotExist(err error) bool { + _, ok := err.(ErrAccessTokenNotExist) + return ok +} + +func (err ErrAccessTokenNotExist) Error() string { + return fmt.Sprintf("access token does not exist: %v", err.args) +} + +func (ErrAccessTokenNotExist) NotFound() bool { + return true +} + +func (db *accessTokens) GetBySHA(sha string) (*AccessToken, error) { + token := new(AccessToken) + err := db.Where("sha1 = ?", sha).First(token).Error + if err != nil { + if err == gorm.ErrRecordNotFound { + return nil, ErrAccessTokenNotExist{args: errutil.Args{"sha": sha}} + } + return nil, err + } + return token, nil +} + +func (db *accessTokens) Save(t *AccessToken) error { + return db.DB.Save(t).Error +} diff --git a/internal/db/db.go b/internal/db/db.go new file mode 100644 index 00000000..85503533 --- /dev/null +++ b/internal/db/db.go @@ -0,0 +1,171 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package db + +import ( + "fmt" + "io" + "net/url" + "path/filepath" + "strings" + "time" + + "github.com/jinzhu/gorm" + _ "github.com/jinzhu/gorm/dialects/mssql" + _ "github.com/jinzhu/gorm/dialects/mysql" + _ "github.com/jinzhu/gorm/dialects/postgres" + _ "github.com/jinzhu/gorm/dialects/sqlite" + "github.com/pkg/errors" + log "unknwon.dev/clog/v2" + + "gogs.io/gogs/internal/conf" + "gogs.io/gogs/internal/dbutil" +) + +// parsePostgreSQLHostPort parses given input in various forms defined in +// https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING +// and returns proper host and port number. +func parsePostgreSQLHostPort(info string) (string, string) { + host, port := "127.0.0.1", "5432" + if strings.Contains(info, ":") && !strings.HasSuffix(info, "]") { + idx := strings.LastIndex(info, ":") + host = info[:idx] + port = info[idx+1:] + } else if len(info) > 0 { + host = info + } + return host, port +} + +func parseMSSQLHostPort(info string) (string, string) { + host, port := "127.0.0.1", "1433" + if strings.Contains(info, ":") { + host = strings.Split(info, ":")[0] + port = strings.Split(info, ":")[1] + } else if strings.Contains(info, ",") { + host = strings.Split(info, ",")[0] + port = strings.TrimSpace(strings.Split(info, ",")[1]) + } else if len(info) > 0 { + host = info + } + return host, port +} + +// parseDSN takes given database options and returns parsed DSN. +func parseDSN(opts conf.DatabaseOpts) (dsn string, err error) { + // In case the database name contains "?" with some parameters + concate := "?" + if strings.Contains(opts.Name, concate) { + concate = "&" + } + + switch opts.Type { + case "mysql": + if opts.Host[0] == '/' { // Looks like a unix socket + dsn = fmt.Sprintf("%s:%s@unix(%s)/%s%scharset=utf8mb4&parseTime=true", + opts.User, opts.Password, opts.Host, opts.Name, concate) + } else { + dsn = fmt.Sprintf("%s:%s@tcp(%s)/%s%scharset=utf8mb4&parseTime=true", + opts.User, opts.Password, opts.Host, opts.Name, concate) + } + + case "postgres": + host, port := parsePostgreSQLHostPort(opts.Host) + if host[0] == '/' { // looks like a unix socket + dsn = fmt.Sprintf("postgres://%s:%s@:%s/%s%ssslmode=%s&host=%s", + url.QueryEscape(opts.User), url.QueryEscape(opts.Password), port, opts.Name, concate, opts.SSLMode, host) + } else { + dsn = fmt.Sprintf("postgres://%s:%s@%s:%s/%s%ssslmode=%s", + url.QueryEscape(opts.User), url.QueryEscape(opts.Password), host, port, opts.Name, concate, opts.SSLMode) + } + + case "mssql": + host, port := parseMSSQLHostPort(opts.Host) + dsn = fmt.Sprintf("server=%s; port=%s; database=%s; user id=%s; password=%s;", + host, port, opts.Name, opts.User, opts.Password) + + case "sqlite3": + dsn = "file:" + opts.Path + "?cache=shared&mode=rwc" + + default: + return "", errors.Errorf("unrecognized dialect: %s", opts.Type) + } + + return dsn, nil +} + +func openDB(opts conf.DatabaseOpts) (*gorm.DB, error) { + dsn, err := parseDSN(opts) + if err != nil { + return nil, errors.Wrap(err, "parse DSN") + } + + return gorm.Open(opts.Type, dsn) +} + +func getLogWriter() (io.Writer, error) { + sec := conf.File.Section("log.gorm") + w, err := log.NewFileWriter( + filepath.Join(conf.Log.RootPath, "gorm.log"), + log.FileRotationConfig{ + Rotate: sec.Key("ROTATE").MustBool(true), + Daily: sec.Key("ROTATE_DAILY").MustBool(true), + MaxSize: sec.Key("MAX_SIZE").MustInt64(100) * 1024 * 1024, + MaxDays: sec.Key("MAX_DAYS").MustInt64(3), + }, + ) + if err != nil { + return nil, errors.Wrap(err, `create "gorm.log"`) + } + return w, nil +} + +func Init() error { + db, err := openDB(conf.Database) + if err != nil { + return errors.Wrap(err, "open database") + } + db.SingularTable(true) + db.DB().SetMaxOpenConns(conf.Database.MaxOpenConns) + db.DB().SetMaxIdleConns(conf.Database.MaxIdleConns) + db.DB().SetConnMaxLifetime(time.Minute) + + w, err := getLogWriter() + if err != nil { + return errors.Wrap(err, "get log writer") + } + db.SetLogger(&dbutil.Writer{Writer: w}) + if !conf.IsProdMode() { + db = db.LogMode(true) + } + + switch conf.Database.Type { + case "mysql": + conf.UseMySQL = true + db = db.Set("gorm:table_options", "ENGINE=InnoDB") + case "postgres": + conf.UsePostgreSQL = true + case "mssql": + conf.UseMSSQL = true + case "sqlite3": + conf.UseMySQL = true + } + + err = db.AutoMigrate(new(LFSObject)).Error + if err != nil { + return errors.Wrap(err, "migrate schemes") + } + + // Initialize stores, sorted in alphabetical order. + AccessTokens = &accessTokens{DB: db} + LoginSources = &loginSources{DB: db} + LFS = &lfs{DB: db} + Perms = &perms{DB: db} + Repos = &repos{DB: db} + TwoFactors = &twoFactors{DB: db} + Users = &users{DB: db} + + return db.DB().Ping() +} diff --git a/internal/db/error.go b/internal/db/error.go index dff234d9..ce87debd 100644 --- a/internal/db/error.go +++ b/internal/db/error.go @@ -218,38 +218,6 @@ func (err ErrDeployKeyNameAlreadyUsed) Error() string { return fmt.Sprintf("public key already exists [repo_id: %d, name: %s]", err.RepoID, err.Name) } -// _____ ___________ __ -// / _ \ ____ ____ ____ ______ _____\__ ___/___ | | __ ____ ____ -// / /_\ \_/ ___\/ ___\/ __ \ / ___// ___/ | | / _ \| |/ // __ \ / \ -// / | \ \__\ \__\ ___/ \___ \ \___ \ | |( <_> ) <\ ___/| | \ -// \____|__ /\___ >___ >___ >____ >____ > |____| \____/|__|_ \\___ >___| / -// \/ \/ \/ \/ \/ \/ \/ \/ \/ - -type ErrAccessTokenNotExist struct { - SHA string -} - -func IsErrAccessTokenNotExist(err error) bool { - _, ok := err.(ErrAccessTokenNotExist) - return ok -} - -func (err ErrAccessTokenNotExist) Error() string { - return fmt.Sprintf("access token does not exist [sha: %s]", err.SHA) -} - -type ErrAccessTokenEmpty struct { -} - -func IsErrAccessTokenEmpty(err error) bool { - _, ok := err.(ErrAccessTokenEmpty) - return ok -} - -func (err ErrAccessTokenEmpty) Error() string { - return fmt.Sprintf("access token is empty") -} - // ________ .__ __ .__ // \_____ \_______ _________ ____ |__|____________ _/ |_|__| ____ ____ // / | \_ __ \/ ___\__ \ / \| \___ /\__ \\ __\ |/ _ \ / \ diff --git a/internal/db/errors/login_source.go b/internal/db/errors/login_source.go index dd18664e..876a0820 100644 --- a/internal/db/errors/login_source.go +++ b/internal/db/errors/login_source.go @@ -45,16 +45,3 @@ func (err InvalidLoginSourceType) Error() string { return fmt.Sprintf("invalid login source type [type: %v]", err.Type) } -type LoginSourceMismatch struct { - Expect int64 - Actual int64 -} - -func IsLoginSourceMismatch(err error) bool { - _, ok := err.(LoginSourceMismatch) - return ok -} - -func (err LoginSourceMismatch) Error() string { - return fmt.Sprintf("login source mismatch [expect: %d, actual: %d]", err.Expect, err.Actual) -} diff --git a/internal/db/errors/two_factor.go b/internal/db/errors/two_factor.go index 02cdcf5c..c474152d 100644 --- a/internal/db/errors/two_factor.go +++ b/internal/db/errors/two_factor.go @@ -18,16 +18,3 @@ func IsTwoFactorNotFound(err error) bool { func (err TwoFactorNotFound) Error() string { return fmt.Sprintf("two-factor authentication does not found [user_id: %d]", err.UserID) } - -type TwoFactorRecoveryCodeNotFound struct { - Code string -} - -func IsTwoFactorRecoveryCodeNotFound(err error) bool { - _, ok := err.(TwoFactorRecoveryCodeNotFound) - return ok -} - -func (err TwoFactorRecoveryCodeNotFound) Error() string { - return fmt.Sprintf("two-factor recovery code does not found [code: %s]", err.Code) -} diff --git a/internal/db/issue.go b/internal/db/issue.go index b153e6a1..6347c99d 100644 --- a/internal/db/issue.go +++ b/internal/db/issue.go @@ -681,7 +681,7 @@ func newIssue(e *xorm.Session, opts NewIssueOptions) (err error) { // Assume assignee is invalid and drop silently. opts.Issue.AssigneeID = 0 if assignee != nil { - valid, err := hasAccess(e, assignee.ID, opts.Repo, ACCESS_MODE_READ) + valid, err := hasAccess(e, assignee.ID, opts.Repo, AccessModeRead) if err != nil { return fmt.Errorf("hasAccess [user_id: %d, repo_id: %d]: %v", assignee.ID, opts.Repo.ID, err) } diff --git a/internal/db/lfs.go b/internal/db/lfs.go new file mode 100644 index 00000000..bf1af0bb --- /dev/null +++ b/internal/db/lfs.go @@ -0,0 +1,129 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package db + +import ( + "fmt" + "io" + "os" + "path/filepath" + "time" + + "github.com/jinzhu/gorm" + "github.com/pkg/errors" + + "gogs.io/gogs/internal/conf" + "gogs.io/gogs/internal/errutil" + "gogs.io/gogs/internal/lfsutil" +) + +// LFSStore is the persistent interface for LFS objects. +// +// NOTE: All methods are sorted in alphabetical order. +type LFSStore interface { + // CreateObject streams io.ReadCloser to target storage and creates a record in database. + CreateObject(repoID int64, oid lfsutil.OID, rc io.ReadCloser, storage lfsutil.Storage) error + // GetObjectByOID returns the LFS object with given OID. It returns ErrLFSObjectNotExist + // when not found. + GetObjectByOID(repoID int64, oid lfsutil.OID) (*LFSObject, error) + // GetObjectsByOIDs returns LFS objects found within "oids". The returned list could have + // less elements if some oids were not found. + GetObjectsByOIDs(repoID int64, oids ...lfsutil.OID) ([]*LFSObject, error) +} + +var LFS LFSStore + +type lfs struct { + *gorm.DB +} + +// LFSObject is the relation between an LFS object and a repository. +type LFSObject struct { + RepoID int64 `gorm:"PRIMARY_KEY;AUTO_INCREMENT:false"` + OID lfsutil.OID `gorm:"PRIMARY_KEY;column:oid"` + Size int64 `gorm:"NOT NULL"` + Storage lfsutil.Storage `gorm:"NOT NULL"` + CreatedAt time.Time `gorm:"NOT NULL"` +} + +func (db *lfs) CreateObject(repoID int64, oid lfsutil.OID, rc io.ReadCloser, storage lfsutil.Storage) (err error) { + if storage != lfsutil.StorageLocal { + return errors.New("only local storage is supported") + } + + fpath := lfsutil.StorageLocalPath(conf.LFS.ObjectsPath, oid) + defer func() { + rc.Close() + + if err != nil { + _ = os.Remove(fpath) + } + }() + + err = os.MkdirAll(filepath.Dir(fpath), os.ModePerm) + if err != nil { + return errors.Wrap(err, "create directories") + } + w, err := os.Create(fpath) + if err != nil { + return errors.Wrap(err, "create file") + } + defer w.Close() + + written, err := io.Copy(w, rc) + if err != nil { + return errors.Wrap(err, "copy file") + } + + object := &LFSObject{ + RepoID: repoID, + OID: oid, + Size: written, + Storage: storage, + } + return db.DB.Create(object).Error +} + +type ErrLFSObjectNotExist struct { + args errutil.Args +} + +func IsErrLFSObjectNotExist(err error) bool { + _, ok := err.(ErrLFSObjectNotExist) + return ok +} + +func (err ErrLFSObjectNotExist) Error() string { + return fmt.Sprintf("LFS object does not exist: %v", err.args) +} + +func (ErrLFSObjectNotExist) NotFound() bool { + return true +} + +func (db *lfs) GetObjectByOID(repoID int64, oid lfsutil.OID) (*LFSObject, error) { + object := new(LFSObject) + err := db.Where("repo_id = ? AND oid = ?", repoID, oid).First(object).Error + if err != nil { + if err == gorm.ErrRecordNotFound { + return nil, ErrLFSObjectNotExist{args: errutil.Args{"repoID": repoID, "oid": oid}} + } + return nil, err + } + return object, err +} + +func (db *lfs) GetObjectsByOIDs(repoID int64, oids ...lfsutil.OID) ([]*LFSObject, error) { + if len(oids) == 0 { + return []*LFSObject{}, nil + } + + objects := make([]*LFSObject, 0, len(oids)) + err := db.Where("repo_id = ? AND oid IN (?)", repoID, oids).Find(&objects).Error + if err != nil && err != gorm.ErrRecordNotFound { + return nil, err + } + return objects, nil +} diff --git a/internal/db/login_source.go b/internal/db/login_source.go index 80d65f6e..aabca145 100644 --- a/internal/db/login_source.go +++ b/internal/db/login_source.go @@ -35,21 +35,21 @@ type LoginType int // Note: new type must append to the end of list to maintain compatibility. const ( - LOGIN_NOTYPE LoginType = iota - LOGIN_PLAIN // 1 - LOGIN_LDAP // 2 - LOGIN_SMTP // 3 - LOGIN_PAM // 4 - LOGIN_DLDAP // 5 - LOGIN_GITHUB // 6 + LoginNotype LoginType = iota + LoginPlain // 1 + LoginLDAP // 2 + LoginSMTP // 3 + LoginPAM // 4 + LoginDLDAP // 5 + LoginGitHub // 6 ) var LoginNames = map[LoginType]string{ - LOGIN_LDAP: "LDAP (via BindDN)", - LOGIN_DLDAP: "LDAP (simple auth)", // Via direct bind - LOGIN_SMTP: "SMTP", - LOGIN_PAM: "PAM", - LOGIN_GITHUB: "GitHub", + LoginLDAP: "LDAP (via BindDN)", + LoginDLDAP: "LDAP (simple auth)", // Via direct bind + LoginSMTP: "SMTP", + LoginPAM: "PAM", + LoginGitHub: "GitHub", } var SecurityProtocolNames = map[ldap.SecurityProtocol]string{ @@ -185,13 +185,13 @@ func (s *LoginSource) BeforeSet(colName string, val xorm.Cell) { switch colName { case "type": switch LoginType(Cell2Int64(val)) { - case LOGIN_LDAP, LOGIN_DLDAP: + case LoginLDAP, LoginDLDAP: s.Cfg = new(LDAPConfig) - case LOGIN_SMTP: + case LoginSMTP: s.Cfg = new(SMTPConfig) - case LOGIN_PAM: + case LoginPAM: s.Cfg = new(PAMConfig) - case LOGIN_GITHUB: + case LoginGitHub: s.Cfg = new(GitHubConfig) default: panic("unrecognized login source type: " + com.ToStr(*val)) @@ -213,23 +213,23 @@ func (s *LoginSource) TypeName() string { } func (s *LoginSource) IsLDAP() bool { - return s.Type == LOGIN_LDAP + return s.Type == LoginLDAP } func (s *LoginSource) IsDLDAP() bool { - return s.Type == LOGIN_DLDAP + return s.Type == LoginDLDAP } func (s *LoginSource) IsSMTP() bool { - return s.Type == LOGIN_SMTP + return s.Type == LoginSMTP } func (s *LoginSource) IsPAM() bool { - return s.Type == LOGIN_PAM + return s.Type == LoginPAM } func (s *LoginSource) IsGitHub() bool { - return s.Type == LOGIN_GITHUB + return s.Type == LoginGitHub } func (s *LoginSource) HasTLS() bool { @@ -240,9 +240,9 @@ func (s *LoginSource) HasTLS() bool { func (s *LoginSource) UseTLS() bool { switch s.Type { - case LOGIN_LDAP, LOGIN_DLDAP: + case LoginLDAP, LoginDLDAP: return s.LDAP().SecurityProtocol != ldap.SECURITY_PROTOCOL_UNENCRYPTED - case LOGIN_SMTP: + case LoginSMTP: return s.SMTP().TLS } @@ -251,9 +251,9 @@ func (s *LoginSource) UseTLS() bool { func (s *LoginSource) SkipVerify() bool { switch s.Type { - case LOGIN_LDAP, LOGIN_DLDAP: + case LoginLDAP, LoginDLDAP: return s.LDAP().SkipVerify - case LOGIN_SMTP: + case LoginSMTP: return s.SMTP().SkipVerify } @@ -293,8 +293,8 @@ func CreateLoginSource(source *LoginSource) error { return nil } -// LoginSources returns all login sources defined. -func LoginSources() ([]*LoginSource, error) { +// ListLoginSources returns all login sources defined. +func ListLoginSources() ([]*LoginSource, error) { sources := make([]*LoginSource, 0, 2) if err := x.Find(&sources); err != nil { return nil, err @@ -312,18 +312,6 @@ func ActivatedLoginSources() ([]*LoginSource, error) { return append(sources, localLoginSources.ActivatedList()...), nil } -// GetLoginSourceByID returns login source by given ID. -func GetLoginSourceByID(id int64) (*LoginSource, error) { - source := new(LoginSource) - has, err := x.Id(id).Get(source) - if err != nil { - return nil, err - } else if !has { - return localLoginSources.GetLoginSourceByID(id) - } - return source, nil -} - // ResetNonDefaultLoginSources clean other default source flag func ResetNonDefaultLoginSources(source *LoginSource) error { // update changes to DB @@ -504,19 +492,19 @@ func LoadAuthSources() { authType := s.Key("type").String() switch authType { case "ldap_bind_dn": - loginSource.Type = LOGIN_LDAP + loginSource.Type = LoginLDAP loginSource.Cfg = &LDAPConfig{} case "ldap_simple_auth": - loginSource.Type = LOGIN_DLDAP + loginSource.Type = LoginDLDAP loginSource.Cfg = &LDAPConfig{} case "smtp": - loginSource.Type = LOGIN_SMTP + loginSource.Type = LoginSMTP loginSource.Cfg = &SMTPConfig{} case "pam": - loginSource.Type = LOGIN_PAM + loginSource.Type = LoginPAM loginSource.Cfg = &PAMConfig{} case "github": - loginSource.Type = LOGIN_GITHUB + loginSource.Type = LoginGitHub loginSource.Cfg = &GitHubConfig{} default: log.Fatal("Failed to load authentication source: unknown type '%s'", authType) @@ -552,15 +540,15 @@ func composeFullName(firstname, surname, username string) string { // LoginViaLDAP queries if login/password is valid against the LDAP directory pool, // and create a local user if success when enabled. -func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoRegister bool) (*User, error) { - username, fn, sn, mail, isAdmin, succeed := source.Cfg.(*LDAPConfig).SearchEntry(login, password, source.Type == LOGIN_DLDAP) +func LoginViaLDAP(login, password string, source *LoginSource, autoRegister bool) (*User, error) { + username, fn, sn, mail, isAdmin, succeed := source.Cfg.(*LDAPConfig).SearchEntry(login, password, source.Type == LoginDLDAP) if !succeed { // User not in LDAP, do nothing return nil, ErrUserNotExist{args: map[string]interface{}{"login": login}} } if !autoRegister { - return user, nil + return nil, nil } // Fallback. @@ -576,7 +564,7 @@ func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoR mail = fmt.Sprintf("%s@localhost", username) } - user = &User{ + user := &User{ LowerName: strings.ToLower(username), Name: username, FullName: composeFullName(fn, sn, username), @@ -669,7 +657,7 @@ func SMTPAuth(a smtp.Auth, cfg *SMTPConfig) error { // LoginViaSMTP queries if login/password is valid against the SMTP, // and create a local user if success when enabled. -func LoginViaSMTP(user *User, login, password string, sourceID int64, cfg *SMTPConfig, autoRegister bool) (*User, error) { +func LoginViaSMTP(login, password string, sourceID int64, cfg *SMTPConfig, autoRegister bool) (*User, error) { // Verify allowed domains. if len(cfg.AllowedDomains) > 0 { idx := strings.Index(login, "@") @@ -701,7 +689,7 @@ func LoginViaSMTP(user *User, login, password string, sourceID int64, cfg *SMTPC } if !autoRegister { - return user, nil + return nil, nil } username := login @@ -710,12 +698,12 @@ func LoginViaSMTP(user *User, login, password string, sourceID int64, cfg *SMTPC username = login[:idx] } - user = &User{ + user := &User{ LowerName: strings.ToLower(username), Name: strings.ToLower(username), Email: login, Passwd: password, - LoginType: LOGIN_SMTP, + LoginType: LoginSMTP, LoginSource: sourceID, LoginName: login, IsActive: true, @@ -732,7 +720,7 @@ func LoginViaSMTP(user *User, login, password string, sourceID int64, cfg *SMTPC // LoginViaPAM queries if login/password is valid against the PAM, // and create a local user if success when enabled. -func LoginViaPAM(user *User, login, password string, sourceID int64, cfg *PAMConfig, autoRegister bool) (*User, error) { +func LoginViaPAM(login, password string, sourceID int64, cfg *PAMConfig, autoRegister bool) (*User, error) { if err := pam.PAMAuth(cfg.ServiceName, login, password); err != nil { if strings.Contains(err.Error(), "Authentication failure") { return nil, ErrUserNotExist{args: map[string]interface{}{"login": login}} @@ -741,15 +729,15 @@ func LoginViaPAM(user *User, login, password string, sourceID int64, cfg *PAMCon } if !autoRegister { - return user, nil + return nil, nil } - user = &User{ + user := &User{ LowerName: strings.ToLower(login), Name: login, Email: login, Passwd: password, - LoginType: LOGIN_PAM, + LoginType: LoginPAM, LoginSource: sourceID, LoginName: login, IsActive: true, @@ -757,14 +745,14 @@ func LoginViaPAM(user *User, login, password string, sourceID int64, cfg *PAMCon return user, CreateUser(user) } -//________.__ __ ___ ___ ___. -/// _____/|__|/ |_ / | \ __ _\_ |__ -/// \ ___| \ __\/ ~ \ | \ __ \ -//\ \_\ \ || | \ Y / | / \_\ \ -//\______ /__||__| \___|_ /|____/|___ / -//\/ \/ \/ +// ________.__ __ ___ ___ ___. +// / _____/|__|/ |_ / | \ __ _\_ |__ +// / \ ___| \ __\/ ~ \ | \ __ \ +// \ \_\ \ || | \ Y / | / \_\ \ +// \______ /__||__| \___|_ /|____/|___ / +// \/ \/ \/ -func LoginViaGitHub(user *User, login, password string, sourceID int64, cfg *GitHubConfig, autoRegister bool) (*User, error) { +func LoginViaGitHub(login, password string, sourceID int64, cfg *GitHubConfig, autoRegister bool) (*User, error) { fullname, email, url, location, err := github.Authenticate(cfg.APIEndpoint, login, password) if err != nil { if strings.Contains(err.Error(), "401") { @@ -774,16 +762,16 @@ func LoginViaGitHub(user *User, login, password string, sourceID int64, cfg *Git } if !autoRegister { - return user, nil + return nil, nil } - user = &User{ + user := &User{ LowerName: strings.ToLower(login), Name: login, FullName: fullname, Email: email, Website: url, Passwd: password, - LoginType: LOGIN_GITHUB, + LoginType: LoginGitHub, LoginSource: sourceID, LoginName: login, IsActive: true, @@ -792,75 +780,21 @@ func LoginViaGitHub(user *User, login, password string, sourceID int64, cfg *Git return user, CreateUser(user) } -func remoteUserLogin(user *User, login, password string, source *LoginSource, autoRegister bool) (*User, error) { +func authenticateViaLoginSource(source *LoginSource, login, password string, autoRegister bool) (*User, error) { if !source.IsActived { return nil, errors.LoginSourceNotActivated{SourceID: source.ID} } switch source.Type { - case LOGIN_LDAP, LOGIN_DLDAP: - return LoginViaLDAP(user, login, password, source, autoRegister) - case LOGIN_SMTP: - return LoginViaSMTP(user, login, password, source.ID, source.Cfg.(*SMTPConfig), autoRegister) - case LOGIN_PAM: - return LoginViaPAM(user, login, password, source.ID, source.Cfg.(*PAMConfig), autoRegister) - case LOGIN_GITHUB: - return LoginViaGitHub(user, login, password, source.ID, source.Cfg.(*GitHubConfig), autoRegister) + case LoginLDAP, LoginDLDAP: + return LoginViaLDAP(login, password, source, autoRegister) + case LoginSMTP: + return LoginViaSMTP(login, password, source.ID, source.Cfg.(*SMTPConfig), autoRegister) + case LoginPAM: + return LoginViaPAM(login, password, source.ID, source.Cfg.(*PAMConfig), autoRegister) + case LoginGitHub: + return LoginViaGitHub(login, password, source.ID, source.Cfg.(*GitHubConfig), autoRegister) } return nil, errors.InvalidLoginSourceType{Type: source.Type} } - -// UserLogin validates user name and password via given login source ID. -// If the loginSourceID is negative, it will abort login process if user is not found. -func UserLogin(username, password string, loginSourceID int64) (*User, error) { - var user *User - if strings.Contains(username, "@") { - user = &User{Email: strings.ToLower(username)} - } else { - user = &User{LowerName: strings.ToLower(username)} - } - - hasUser, err := x.Get(user) - if err != nil { - return nil, fmt.Errorf("get user record: %v", err) - } - - if hasUser { - // Note: This check is unnecessary but to reduce user confusion at login page - // and make it more consistent at user's perspective. - if loginSourceID >= 0 && user.LoginSource != loginSourceID { - return nil, errors.LoginSourceMismatch{Expect: loginSourceID, Actual: user.LoginSource} - } - - // Validate password hash fetched from database for local accounts - if user.LoginType == LOGIN_NOTYPE || - user.LoginType == LOGIN_PLAIN { - if user.ValidatePassword(password) { - return user, nil - } - - return nil, ErrUserNotExist{args: map[string]interface{}{"userID": user.ID, "name": user.Name}} - } - - // Remote login to the login source the user is associated with - source, err := GetLoginSourceByID(user.LoginSource) - if err != nil { - return nil, err - } - - return remoteUserLogin(user, user.LoginName, password, source, false) - } - - // Non-local login source is always greater than 0 - if loginSourceID <= 0 { - return nil, ErrUserNotExist{args: map[string]interface{}{"name": username}} - } - - source, err := GetLoginSourceByID(loginSourceID) - if err != nil { - return nil, err - } - - return remoteUserLogin(nil, username, password, source, true) -} diff --git a/internal/db/login_sources.go b/internal/db/login_sources.go new file mode 100644 index 00000000..91432ff4 --- /dev/null +++ b/internal/db/login_sources.go @@ -0,0 +1,36 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package db + +import ( + "github.com/jinzhu/gorm" +) + +// LoginSourcesStore is the persistent interface for login sources. +// +// NOTE: All methods are sorted in alphabetical order. +type LoginSourcesStore interface { + // GetByID returns the login source with given ID. + // It returns ErrLoginSourceNotExist when not found. + GetByID(id int64) (*LoginSource, error) +} + +var LoginSources LoginSourcesStore + +type loginSources struct { + *gorm.DB +} + +func (db *loginSources) GetByID(id int64) (*LoginSource, error) { + source := new(LoginSource) + err := db.Where("id = ?", id).First(source).Error + if err != nil { + if err == gorm.ErrRecordNotFound { + return localLoginSources.GetLoginSourceByID(id) + } + return nil, err + } + return source, nil +} diff --git a/internal/db/models.go b/internal/db/models.go index cf00727e..3bb35e7f 100644 --- a/internal/db/models.go +++ b/internal/db/models.go @@ -7,7 +7,6 @@ package db import ( "bufio" "database/sql" - "errors" "fmt" "net/url" "os" @@ -15,10 +14,7 @@ import ( "strings" "time" - _ "github.com/denisenkom/go-mssqldb" - _ "github.com/go-sql-driver/mysql" "github.com/json-iterator/go" - _ "github.com/lib/pq" "github.com/unknwon/com" log "unknwon.dev/clog/v2" "xorm.io/core" @@ -48,8 +44,6 @@ var ( x *xorm.Engine tables []interface{} HasEngine bool - - EnableSQLite3 bool ) func init() { @@ -70,35 +64,6 @@ func init() { } } -// parsePostgreSQLHostPort parses given input in various forms defined in -// https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING -// and returns proper host and port number. -func parsePostgreSQLHostPort(info string) (string, string) { - host, port := "127.0.0.1", "5432" - if strings.Contains(info, ":") && !strings.HasSuffix(info, "]") { - idx := strings.LastIndex(info, ":") - host = info[:idx] - port = info[idx+1:] - } else if len(info) > 0 { - host = info - } - return host, port -} - -func parseMSSQLHostPort(info string) (string, string) { - host, port := "127.0.0.1", "1433" - if strings.Contains(info, ":") { - host = strings.Split(info, ":")[0] - port = strings.Split(info, ":")[1] - } else if strings.Contains(info, ",") { - host = strings.Split(info, ",")[0] - port = strings.TrimSpace(strings.Split(info, ",")[1]) - } else if len(info) > 0 { - host = info - } - return host, port -} - func getEngine() (*xorm.Engine, error) { Param := "?" if strings.Contains(conf.Database.Name, Param) { @@ -133,12 +98,9 @@ func getEngine() (*xorm.Engine, error) { case "mssql": conf.UseMSSQL = true host, port := parseMSSQLHostPort(conf.Database.Host) - connStr = fmt.Sprintf("server=%s; port=%s; database=%s; user id=%s; password=%s;", host, port, conf.Database.Name, conf.Database.User, conf.Database.Passwd) + connStr = fmt.Sprintf("server=%s; port=%s; database=%s; user id=%s; password=%s;", host, port, conf.Database.Name, conf.Database.User, conf.Database.Password) case "sqlite3": - if !EnableSQLite3 { - return nil, errors.New("this binary version does not build support for SQLite3") - } if err := os.MkdirAll(path.Dir(conf.Database.Path), os.ModePerm); err != nil { return nil, fmt.Errorf("create directories: %v", err) } @@ -183,9 +145,8 @@ func SetEngine() (err error) { return fmt.Errorf("create 'xorm.log': %v", err) } - // To prevent mystery "MySQL: invalid connection" error, - // see https://gogs.io/gogs/issues/5532. - x.SetMaxIdleConns(0) + x.SetMaxOpenConns(conf.Database.MaxOpenConns) + x.SetMaxIdleConns(conf.Database.MaxIdleConns) x.SetConnMaxLifetime(time.Second) if conf.IsProdMode() { @@ -194,7 +155,7 @@ func SetEngine() (err error) { x.SetLogger(xorm.NewSimpleLogger(logger)) } x.ShowSQL(true) - return nil + return Init() } func NewEngine() (err error) { @@ -331,13 +292,13 @@ func ImportDatabase(dirPath string, verbose bool) (err error) { tp := LoginType(com.StrTo(com.ToStr(meta["Type"])).MustInt64()) switch tp { - case LOGIN_LDAP, LOGIN_DLDAP: + case LoginLDAP, LoginDLDAP: bean.Cfg = new(LDAPConfig) - case LOGIN_SMTP: + case LoginSMTP: bean.Cfg = new(SMTPConfig) - case LOGIN_PAM: + case LoginPAM: bean.Cfg = new(PAMConfig) - case LOGIN_GITHUB: + case LoginGitHub: bean.Cfg = new(GitHubConfig) default: return fmt.Errorf("unrecognized login source type:: %v", tp) diff --git a/internal/db/models_sqlite.go b/internal/db/models_sqlite.go deleted file mode 100644 index c462cc5d..00000000 --- a/internal/db/models_sqlite.go +++ /dev/null @@ -1,15 +0,0 @@ -// +build sqlite - -// Copyright 2014 The Gogs Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package db - -import ( - _ "github.com/mattn/go-sqlite3" -) - -func init() { - EnableSQLite3 = true -} diff --git a/internal/db/org.go b/internal/db/org.go index bcf307a7..b28d4333 100644 --- a/internal/db/org.go +++ b/internal/db/org.go @@ -148,7 +148,7 @@ func CreateOrganization(org, owner *User) (err error) { OrgID: org.ID, LowerName: strings.ToLower(OWNER_TEAM), Name: OWNER_TEAM, - Authorize: ACCESS_MODE_OWNER, + Authorize: AccessModeOwner, NumMembers: 1, } if _, err = sess.Insert(t); err != nil { diff --git a/internal/db/org_team.go b/internal/db/org_team.go index 8ed587db..f5309888 100644 --- a/internal/db/org_team.go +++ b/internal/db/org_team.go @@ -47,7 +47,7 @@ func (t *Team) IsOwnerTeam() bool { // HasWriteAccess returns true if team has at least write level access mode. func (t *Team) HasWriteAccess() bool { - return t.Authorize >= ACCESS_MODE_WRITE + return t.Authorize >= AccessModeWrite } // IsTeamMember returns true if given user is a member of team. @@ -174,7 +174,7 @@ func (t *Team) removeRepository(e Engine, repo *Repository, recalculate bool) (e return fmt.Errorf("get team members: %v", err) } for _, member := range t.Members { - has, err := hasAccess(e, member.ID, repo, ACCESS_MODE_READ) + has, err := hasAccess(e, member.ID, repo, AccessModeRead) if err != nil { return err } else if has { diff --git a/internal/db/perms.go b/internal/db/perms.go new file mode 100644 index 00000000..6dc5d423 --- /dev/null +++ b/internal/db/perms.go @@ -0,0 +1,56 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package db + +import ( + "github.com/jinzhu/gorm" + log "unknwon.dev/clog/v2" +) + +// PermsStore is the persistent interface for permissions. +// +// NOTE: All methods are sorted in alphabetical order. +type PermsStore interface { + // AccessMode returns the access mode of given user has to the repository. + AccessMode(userID int64, repo *Repository) AccessMode + // Authorize returns true if the user has as good as desired access mode to + // the repository. + Authorize(userID int64, repo *Repository, desired AccessMode) bool +} + +var Perms PermsStore + +type perms struct { + *gorm.DB +} + +func (db *perms) AccessMode(userID int64, repo *Repository) AccessMode { + var mode AccessMode + // Everyone has read access to public repository. + if !repo.IsPrivate { + mode = AccessModeRead + } + + // Quick check to avoid a DB query. + if userID <= 0 { + return mode + } + + if userID == repo.OwnerID { + return AccessModeOwner + } + + access := new(Access) + err := db.Where("user_id = ? AND repo_id = ?", userID, repo.ID).First(access).Error + if err != nil { + log.Error("Failed to get access [user_id: %d, repo_id: %d]: %v", userID, repo.ID, err) + return mode + } + return access.Mode +} + +func (db *perms) Authorize(userID int64, repo *Repository, desired AccessMode) bool { + return desired <= db.AccessMode(userID, repo) +} diff --git a/internal/db/repo.go b/internal/db/repo.go index 7c27b26a..a7d54bb9 100644 --- a/internal/db/repo.go +++ b/internal/db/repo.go @@ -492,7 +492,7 @@ func (repo *Repository) getUsersWithAccesMode(e Engine, mode AccessMode) (_ []*U // getAssignees returns a list of users who can be assigned to issues in this repository. func (repo *Repository) getAssignees(e Engine) (_ []*User, err error) { - return repo.getUsersWithAccesMode(e, ACCESS_MODE_READ) + return repo.getUsersWithAccesMode(e, AccessModeRead) } // GetAssignees returns all users that have read access and can be assigned to issues @@ -508,7 +508,7 @@ func (repo *Repository) GetAssigneeByID(userID int64) (*User, error) { // GetWriters returns all users that have write access to the repository. func (repo *Repository) GetWriters() (_ []*User, err error) { - return repo.getUsersWithAccesMode(x, ACCESS_MODE_WRITE) + return repo.getUsersWithAccesMode(x, AccessModeWrite) } // GetMilestoneByID returns the milestone belongs to repository by given ID. @@ -551,7 +551,7 @@ func (repo *Repository) ComposeCompareURL(oldCommitID, newCommitID string) strin } func (repo *Repository) HasAccess(userID int64) bool { - has, _ := HasAccess(userID, repo, ACCESS_MODE_READ) + has, _ := HasAccess(userID, repo, AccessModeRead) return has } @@ -1666,6 +1666,7 @@ func (ErrRepoNotExist) NotFound() bool { } // GetRepositoryByName returns the repository by given name under user if exists. +// Deprecated: Use Repos.GetByName instead. func GetRepositoryByName(ownerID int64, name string) (*Repository, error) { repo := &Repository{ OwnerID: ownerID, diff --git a/internal/db/repo_branch.go b/internal/db/repo_branch.go index 8da99945..ceb99231 100644 --- a/internal/db/repo_branch.go +++ b/internal/db/repo_branch.go @@ -175,7 +175,7 @@ func UpdateOrgProtectBranch(repo *Repository, protectBranch *ProtectBranch, whit userIDs := tool.StringsToInt64s(strings.Split(whitelistUserIDs, ",")) validUserIDs = make([]int64, 0, len(userIDs)) for _, userID := range userIDs { - has, err := HasAccess(userID, repo, ACCESS_MODE_WRITE) + has, err := HasAccess(userID, repo, AccessModeWrite) if err != nil { return fmt.Errorf("HasAccess [user_id: %d, repo_id: %d]: %v", userID, protectBranch.RepoID, err) } else if !has { @@ -193,7 +193,7 @@ func UpdateOrgProtectBranch(repo *Repository, protectBranch *ProtectBranch, whit if protectBranch.WhitelistTeamIDs != whitelistTeamIDs { hasTeamsChanged = true teamIDs := tool.StringsToInt64s(strings.Split(whitelistTeamIDs, ",")) - teams, err := GetTeamsHaveAccessToRepo(repo.OwnerID, repo.ID, ACCESS_MODE_WRITE) + teams, err := GetTeamsHaveAccessToRepo(repo.OwnerID, repo.ID, AccessModeWrite) if err != nil { return fmt.Errorf("GetTeamsHaveAccessToRepo [org_id: %d, repo_id: %d]: %v", repo.OwnerID, repo.ID, err) } diff --git a/internal/db/repo_collaboration.go b/internal/db/repo_collaboration.go index b3d046ec..8aec18dc 100644 --- a/internal/db/repo_collaboration.go +++ b/internal/db/repo_collaboration.go @@ -22,11 +22,11 @@ type Collaboration struct { func (c *Collaboration) ModeI18nKey() string { switch c.Mode { - case ACCESS_MODE_READ: + case AccessModeRead: return "repo.settings.collaboration.read" - case ACCESS_MODE_WRITE: + case AccessModeWrite: return "repo.settings.collaboration.write" - case ACCESS_MODE_ADMIN: + case AccessModeAdmin: return "repo.settings.collaboration.admin" default: return "repo.settings.collaboration.undefined" @@ -64,7 +64,7 @@ func (repo *Repository) AddCollaborator(u *User) error { } else if has { return nil } - collaboration.Mode = ACCESS_MODE_WRITE + collaboration.Mode = AccessModeWrite sess := x.NewSession() defer sess.Close() @@ -96,9 +96,9 @@ func (c *Collaborator) APIFormat() *api.Collaborator { return &api.Collaborator{ User: c.User.APIFormat(), Permissions: api.Permission{ - Admin: c.Collaboration.Mode >= ACCESS_MODE_ADMIN, - Push: c.Collaboration.Mode >= ACCESS_MODE_WRITE, - Pull: c.Collaboration.Mode >= ACCESS_MODE_READ, + Admin: c.Collaboration.Mode >= AccessModeAdmin, + Push: c.Collaboration.Mode >= AccessModeWrite, + Pull: c.Collaboration.Mode >= AccessModeRead, }, } } @@ -131,7 +131,7 @@ func (repo *Repository) GetCollaborators() ([]*Collaborator, error) { // ChangeCollaborationAccessMode sets new access mode for the collaboration. func (repo *Repository) ChangeCollaborationAccessMode(userID int64, mode AccessMode) error { // Discard invalid input - if mode <= ACCESS_MODE_NONE || mode > ACCESS_MODE_OWNER { + if mode <= AccessModeNone || mode > AccessModeOwner { return nil } diff --git a/internal/db/repos.go b/internal/db/repos.go new file mode 100644 index 00000000..bcab7dbd --- /dev/null +++ b/internal/db/repos.go @@ -0,0 +1,38 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package db + +import ( + "strings" + + "github.com/jinzhu/gorm" +) + +// ReposStore is the persistent interface for repositories. +// +// NOTE: All methods are sorted in alphabetical order. +type ReposStore interface { + // GetByName returns the repository with given owner and name. + // It returns ErrRepoNotExist when not found. + GetByName(ownerID int64, name string) (*Repository, error) +} + +var Repos ReposStore + +type repos struct { + *gorm.DB +} + +func (db *repos) GetByName(ownerID int64, name string) (*Repository, error) { + repo := new(Repository) + err := db.Where("owner_id = ? AND lower_name = ?", ownerID, strings.ToLower(name)).First(repo).Error + if err != nil { + if err == gorm.ErrRecordNotFound { + return nil, ErrRepoNotExist{args: map[string]interface{}{"ownerID": ownerID, "name": name}} + } + return nil, err + } + return repo, nil +} diff --git a/internal/db/ssh_key.go b/internal/db/ssh_key.go index b82f81a6..49cee17a 100644 --- a/internal/db/ssh_key.go +++ b/internal/db/ssh_key.go @@ -426,7 +426,7 @@ func AddPublicKey(ownerID int64, name, content string) (*PublicKey, error) { OwnerID: ownerID, Name: name, Content: content, - Mode: ACCESS_MODE_WRITE, + Mode: AccessModeWrite, Type: KEY_TYPE_USER, } if err = addKey(sess, key); err != nil { @@ -656,7 +656,7 @@ func AddDeployKey(repoID int64, name, content string) (*DeployKey, error) { pkey := &PublicKey{ Content: content, - Mode: ACCESS_MODE_READ, + Mode: AccessModeRead, Type: KEY_TYPE_DEPLOY, } has, err := x.Get(pkey) @@ -753,7 +753,7 @@ func DeleteDeployKey(doer *User, id int64) error { if err != nil { return fmt.Errorf("GetRepositoryByID: %v", err) } - yes, err := HasAccess(doer.ID, repo, ACCESS_MODE_ADMIN) + yes, err := HasAccess(doer.ID, repo, AccessModeAdmin) if err != nil { return fmt.Errorf("HasAccess: %v", err) } else if !yes { diff --git a/internal/db/token.go b/internal/db/token.go index e7cb7e99..afe747e0 100644 --- a/internal/db/token.go +++ b/internal/db/token.go @@ -16,17 +16,17 @@ import ( // AccessToken represents a personal access token. type AccessToken struct { - ID int64 - UID int64 `xorm:"INDEX"` - Name string - Sha1 string `xorm:"UNIQUE VARCHAR(40)"` + ID int64 + UserID int64 `xorm:"uid INDEX" gorm:"COLUMN:uid"` + Name string + Sha1 string `xorm:"UNIQUE VARCHAR(40)"` - Created time.Time `xorm:"-" json:"-"` + Created time.Time `xorm:"-" gorm:"-" json:"-"` CreatedUnix int64 - Updated time.Time `xorm:"-" json:"-"` // Note: Updated must below Created for AfterSet. + Updated time.Time `xorm:"-" gorm:"-" json:"-"` // Note: Updated must below Created for AfterSet. UpdatedUnix int64 - HasRecentActivity bool `xorm:"-" json:"-"` - HasUsed bool `xorm:"-" json:"-"` + HasRecentActivity bool `xorm:"-" gorm:"-" json:"-"` + HasUsed bool `xorm:"-" gorm:"-" json:"-"` } func (t *AccessToken) BeforeInsert() { @@ -52,8 +52,8 @@ func (t *AccessToken) AfterSet(colName string, _ xorm.Cell) { func NewAccessToken(t *AccessToken) error { t.Sha1 = tool.SHA1(gouuid.NewV4().String()) has, err := x.Get(&AccessToken{ - UID: t.UID, - Name: t.Name, + UserID: t.UserID, + Name: t.Name, }) if err != nil { return err @@ -65,38 +65,17 @@ func NewAccessToken(t *AccessToken) error { return err } -// GetAccessTokenBySHA returns access token by given sha1. -func GetAccessTokenBySHA(sha string) (*AccessToken, error) { - if sha == "" { - return nil, ErrAccessTokenEmpty{} - } - t := &AccessToken{Sha1: sha} - has, err := x.Get(t) - if err != nil { - return nil, err - } else if !has { - return nil, ErrAccessTokenNotExist{sha} - } - return t, nil -} - // ListAccessTokens returns a list of access tokens belongs to given user. func ListAccessTokens(uid int64) ([]*AccessToken, error) { tokens := make([]*AccessToken, 0, 5) return tokens, x.Where("uid=?", uid).Desc("id").Find(&tokens) } -// UpdateAccessToken updates information of access token. -func UpdateAccessToken(t *AccessToken) error { - _, err := x.Id(t.ID).AllCols().Update(t) - return err -} - // DeleteAccessTokenOfUserByID deletes access token by given ID. func DeleteAccessTokenOfUserByID(userID, id int64) error { _, err := x.Delete(&AccessToken{ - ID: id, - UID: userID, + ID: id, + UserID: userID, }) return err } diff --git a/internal/db/two_factor.go b/internal/db/two_factor.go index a46fb992..e827d59b 100644 --- a/internal/db/two_factor.go +++ b/internal/db/two_factor.go @@ -12,7 +12,6 @@ import ( "github.com/pquerna/otp/totp" "github.com/unknwon/com" - log "unknwon.dev/clog/v2" "xorm.io/xorm" "gogs.io/gogs/internal/conf" @@ -54,15 +53,6 @@ func (t *TwoFactor) ValidateTOTP(passcode string) (bool, error) { return totp.Validate(passcode, string(decryptSecret)), nil } -// IsUserEnabledTwoFactor returns true if user has enabled two-factor authentication. -func IsUserEnabledTwoFactor(userID int64) bool { - has, err := x.Where("user_id = ?", userID).Get(new(TwoFactor)) - if err != nil { - log.Error("IsUserEnabledTwoFactor [user_id: %d]: %v", userID, err) - } - return has -} - func generateRecoveryCodes(userID int64) ([]*TwoFactorRecoveryCode, error) { recoveryCodes := make([]*TwoFactorRecoveryCode, 10) for i := 0; i < 10; i++ { @@ -182,6 +172,19 @@ func RegenerateRecoveryCodes(userID int64) error { return sess.Commit() } +type ErrTwoFactorRecoveryCodeNotFound struct { + Code string +} + +func IsTwoFactorRecoveryCodeNotFound(err error) bool { + _, ok := err.(ErrTwoFactorRecoveryCodeNotFound) + return ok +} + +func (err ErrTwoFactorRecoveryCodeNotFound) Error() string { + return fmt.Sprintf("two-factor recovery code does not found [code: %s]", err.Code) +} + // UseRecoveryCode validates recovery code of given user and marks it is used if valid. func UseRecoveryCode(userID int64, code string) error { recoveryCode := new(TwoFactorRecoveryCode) @@ -189,7 +192,7 @@ func UseRecoveryCode(userID int64, code string) error { if err != nil { return fmt.Errorf("get unused code: %v", err) } else if !has { - return errors.TwoFactorRecoveryCodeNotFound{Code: code} + return ErrTwoFactorRecoveryCodeNotFound{Code: code} } recoveryCode.IsUsed = true diff --git a/internal/db/two_factors.go b/internal/db/two_factors.go new file mode 100644 index 00000000..376cc40c --- /dev/null +++ b/internal/db/two_factors.go @@ -0,0 +1,33 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package db + +import ( + "github.com/jinzhu/gorm" + log "unknwon.dev/clog/v2" +) + +// TwoFactorsStore is the persistent interface for 2FA. +// +// NOTE: All methods are sorted in alphabetical order. +type TwoFactorsStore interface { + // IsUserEnabled returns true if the user has enabled 2FA. + IsUserEnabled(userID int64) bool +} + +var TwoFactors TwoFactorsStore + +type twoFactors struct { + *gorm.DB +} + +func (db *twoFactors) IsUserEnabled(userID int64) bool { + var count int64 + err := db.Model(new(TwoFactor)).Where("user_id = ?", userID).Count(&count).Error + if err != nil { + log.Error("Failed to count two factors [user_id: %d]: %v", userID, err) + } + return count > 0 +} diff --git a/internal/db/user.go b/internal/db/user.go index 4764db4a..a61bb687 100644 --- a/internal/db/user.go +++ b/internal/db/user.go @@ -139,9 +139,9 @@ func (u *User) APIFormat() *api.User { } } -// returns true if user login type is LOGIN_PLAIN. +// returns true if user login type is LoginPlain. func (u *User) IsLocal() bool { - return u.LoginType <= LOGIN_PLAIN + return u.LoginType <= LoginPlain } // HasForkedRepo checks if user has already forked a repository with given ID. @@ -369,7 +369,7 @@ func (u *User) DeleteAvatar() error { // IsAdminOfRepo returns true if user has admin or higher access of repository. func (u *User) IsAdminOfRepo(repo *Repository) bool { - has, err := HasAccess(u.ID, repo, ACCESS_MODE_ADMIN) + has, err := HasAccess(u.ID, repo, AccessModeAdmin) if err != nil { log.Error("HasAccess: %v", err) } @@ -378,7 +378,7 @@ func (u *User) IsAdminOfRepo(repo *Repository) bool { // IsWriterOfRepo returns true if user has write access to given repository. func (u *User) IsWriterOfRepo(repo *Repository) bool { - has, err := HasAccess(u.ID, repo, ACCESS_MODE_WRITE) + has, err := HasAccess(u.ID, repo, AccessModeWrite) if err != nil { log.Error("HasAccess: %v", err) } @@ -402,7 +402,7 @@ func (u *User) IsPublicMember(orgId int64) bool { // IsEnabledTwoFactor returns true if user has enabled two-factor authentication. func (u *User) IsEnabledTwoFactor() bool { - return IsUserEnabledTwoFactor(u.ID) + return TwoFactors.IsUserEnabled(u.ID) } func (u *User) getOrganizationCount(e Engine) (int64, error) { @@ -590,7 +590,7 @@ func CountUsers() int64 { } // Users returns number of users in given page. -func Users(page, pageSize int) ([]*User, error) { +func ListUsers(page, pageSize int) ([]*User, error) { users := make([]*User, 0, pageSize) return users, x.Limit(pageSize, (page-1)*pageSize).Where("type=0").Asc("id").Find(&users) } @@ -786,7 +786,7 @@ func deleteUser(e *xorm.Session, u *User) error { // ***** END: Follow ***** if err = deleteBeans(e, - &AccessToken{UID: u.ID}, + &AccessToken{UserID: u.ID}, &Collaboration{UserID: u.ID}, &Access{UserID: u.ID}, &Watch{UserID: u.ID}, @@ -922,13 +922,14 @@ func getUserByID(e Engine, id int64) (*User, error) { } // GetUserByID returns the user object by given ID if exists. +// Deprecated: Use Users.GetByID instead. func GetUserByID(id int64) (*User, error) { return getUserByID(x, id) } // GetAssigneeByID returns the user with write access of repository by given ID. func GetAssigneeByID(repo *Repository, userID int64) (*User, error) { - has, err := HasAccess(userID, repo, ACCESS_MODE_READ) + has, err := HasAccess(userID, repo, AccessModeRead) if err != nil { return nil, err } else if !has { @@ -938,6 +939,7 @@ func GetAssigneeByID(repo *Repository, userID int64) (*User, error) { } // GetUserByName returns a user by given name. +// Deprecated: Use Users.GetByUsername instead. func GetUserByName(name string) (*User, error) { if len(name) == 0 { return nil, ErrUserNotExist{args: map[string]interface{}{"name": name}} diff --git a/internal/db/users.go b/internal/db/users.go new file mode 100644 index 00000000..cadd106c --- /dev/null +++ b/internal/db/users.go @@ -0,0 +1,138 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package db + +import ( + "fmt" + "strings" + + "github.com/jinzhu/gorm" + "github.com/pkg/errors" + + "gogs.io/gogs/internal/errutil" +) + +// UsersStore is the persistent interface for users. +// +// NOTE: All methods are sorted in alphabetical order. +type UsersStore interface { + // Authenticate validates username and password via given login source ID. + // It returns ErrUserNotExist when the user was not found. + // + // When the "loginSourceID" is negative, it aborts the process and returns + // ErrUserNotExist if the user was not found in the database. + // + // When the "loginSourceID" is non-negative, it returns ErrLoginSourceMismatch + // if the user has different login source ID than the "loginSourceID". + // + // When the "loginSourceID" is positive, it tries to authenticate via given + // login source and creates a new user when not yet exists in the database. + Authenticate(username, password string, loginSourceID int64) (*User, error) + // GetByID returns the user with given ID. It returns ErrUserNotExist when not found. + GetByID(id int64) (*User, error) + // GetByUsername returns the user with given username. It returns ErrUserNotExist + // when not found. + GetByUsername(username string) (*User, error) +} + +var Users UsersStore + +type users struct { + *gorm.DB +} + +type ErrLoginSourceMismatch struct { + args errutil.Args +} + +func (err ErrLoginSourceMismatch) Error() string { + return fmt.Sprintf("login source mismatch: %v", err.args) +} + +func (db *users) Authenticate(username, password string, loginSourceID int64) (*User, error) { + username = strings.ToLower(username) + + var query *gorm.DB + if strings.Contains(username, "@") { + query = db.Where("email = ?", username) + } else { + query = db.Where("lower_name = ?", username) + } + + user := new(User) + err := query.First(user).Error + if err != nil && err != gorm.ErrRecordNotFound { + return nil, errors.Wrap(err, "get user") + } + + // User found in the database + if err == nil { + // Note: This check is unnecessary but to reduce user confusion at login page + // and make it more consistent from user's perspective. + if loginSourceID >= 0 && user.LoginSource != loginSourceID { + return nil, ErrLoginSourceMismatch{args: errutil.Args{"expect": loginSourceID, "actual": user.LoginSource}} + } + + // Validate password hash fetched from database for local accounts. + if user.LoginType == LoginNotype || user.LoginType == LoginPlain { + if user.ValidatePassword(password) { + return user, nil + } + + return nil, ErrUserNotExist{args: map[string]interface{}{"userID": user.ID, "name": user.Name}} + } + + source, err := LoginSources.GetByID(user.LoginSource) + if err != nil { + return nil, errors.Wrap(err, "get login source") + } + + _, err = authenticateViaLoginSource(source, username, password, false) + if err != nil { + return nil, errors.Wrap(err, "authenticate via login source") + } + return user, nil + } + + // Non-local login source is always greater than 0. + if loginSourceID <= 0 { + return nil, ErrUserNotExist{args: map[string]interface{}{"name": username}} + } + + source, err := LoginSources.GetByID(loginSourceID) + if err != nil { + return nil, errors.Wrap(err, "get login source") + } + + user, err = authenticateViaLoginSource(source, username, password, true) + if err != nil { + return nil, errors.Wrap(err, "authenticate via login source") + } + return user, nil +} + +func (db *users) GetByID(id int64) (*User, error) { + user := new(User) + err := db.Where("id = ?", id).First(user).Error + if err != nil { + if err == gorm.ErrRecordNotFound { + return nil, ErrUserNotExist{args: map[string]interface{}{"userID": id}} + } + return nil, err + } + return user, nil +} + +func (db *users) GetByUsername(username string) (*User, error) { + user := new(User) + err := db.Where("lower_name = ?", strings.ToLower(username)).First(user).Error + if err != nil { + if err == gorm.ErrRecordNotFound { + return nil, ErrUserNotExist{args: map[string]interface{}{"name": username}} + } + return nil, err + } + return user, nil +} diff --git a/internal/dbutil/writer.go b/internal/dbutil/writer.go new file mode 100644 index 00000000..6b83d537 --- /dev/null +++ b/internal/dbutil/writer.go @@ -0,0 +1,35 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package dbutil + +import ( + "fmt" + "io" +) + +// Writer is a wrapper of io.Writer for the gorm.logger. +type Writer struct { + io.Writer +} + +func (w *Writer) Print(v ...interface{}) { + if len(v) == 0 { + return + } + + if len(v) == 1 { + fmt.Fprint(w.Writer, v[0]) + return + } + + switch v[0] { + case "sql": + fmt.Fprintf(w.Writer, "[sql] [%s] [%s] %s %v (%d rows affected)", v[1:]...) + case "log": + fmt.Fprintf(w.Writer, "[log] [%s] %s", v[1:]...) + default: + fmt.Fprint(w.Writer, v...) + } +} diff --git a/internal/dbutil/writer_test.go b/internal/dbutil/writer_test.go new file mode 100644 index 00000000..33961aa1 --- /dev/null +++ b/internal/dbutil/writer_test.go @@ -0,0 +1,53 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package dbutil + +import ( + "bytes" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestWriter_Print(t *testing.T) { + tests := []struct { + name string + vs []interface{} + expOutput string + }{ + { + name: "no values", + }, + { + name: "only one value", + vs: []interface{}{"test"}, + expOutput: "test", + }, + { + name: "two values", + vs: []interface{}{"test", "output"}, + expOutput: "testoutput", + }, + + { + name: "sql", + vs: []interface{}{"sql", "writer.go:65", "1ms", "SELECT * FROM users WHERE user_id = $1", []int{1}, 1}, + expOutput: "[sql] [writer.go:65] [1ms] SELECT * FROM users WHERE user_id = $1 [1] (1 rows affected)", + }, + { + name: "log", + vs: []interface{}{"log", "writer.go:65", "something"}, + expOutput: "[log] [writer.go:65] something", + }, + } + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + var buf bytes.Buffer + w := &Writer{Writer: &buf} + w.Print(test.vs...) + assert.Equal(t, test.expOutput, buf.String()) + }) + } +} diff --git a/internal/errutil/errutil.go b/internal/errutil/errutil.go index af658410..4e33a2c5 100644 --- a/internal/errutil/errutil.go +++ b/internal/errutil/errutil.go @@ -14,3 +14,6 @@ func IsNotFound(err error) bool { e, ok := err.(NotFound) return ok && e.NotFound() } + +// Args is a map of key-value pairs to provide additional context of an error. +type Args map[string]interface{} diff --git a/internal/gitutil/module.go b/internal/gitutil/module.go index b5737b81..f34e2961 100644 --- a/internal/gitutil/module.go +++ b/internal/gitutil/module.go @@ -10,7 +10,7 @@ import ( // ModuleStore is the interface for Git operations. // -// NOTE: All methods are sorted in alphabetically. +// NOTE: All methods are sorted in alphabetical order. type ModuleStore interface { // AddRemote adds a new remote to the repository in given path. RepoAddRemote(repoPath, name, url string, opts ...git.AddRemoteOptions) error diff --git a/internal/lfsutil/oid.go b/internal/lfsutil/oid.go new file mode 100644 index 00000000..899c7332 --- /dev/null +++ b/internal/lfsutil/oid.go @@ -0,0 +1,30 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package lfsutil + +import ( + "strings" +) + +// OID is an LFS object ID. +type OID string + +// ValidOID returns true if given oid is valid according to spec: +// https://github.com/git-lfs/git-lfs/blob/master/docs/spec.md +func ValidOID(oid OID) bool { + fields := strings.SplitN(string(oid), ":", 2) + if len(fields) != 2 { + return false + } + method := fields[0] + hash := fields[1] + + switch method { + case "sha256": + // SHA256 produces 64-char lower case hexadecimal hash + return len(hash) == 64 && strings.ToLower(hash) == hash + } + return false +} diff --git a/internal/lfsutil/oid_test.go b/internal/lfsutil/oid_test.go new file mode 100644 index 00000000..1e3b020a --- /dev/null +++ b/internal/lfsutil/oid_test.go @@ -0,0 +1,47 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package lfsutil + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestValidOID(t *testing.T) { + tests := []struct { + name string + oid OID + expVal bool + }{ + { + name: "malformed", + oid: OID("12345678"), + }, + { + name: "unknown method", + oid: OID("sha1:7c222fb2927d828af22f592134e8932480637c0d"), + }, + + { + name: "sha256: malformed", + oid: OID("sha256:7c222fb2927d828af22f592134e8932480637c0d"), + }, + { + name: "sha256: not all lower cased", + oid: OID("sha256:EF797c8118f02dfb649607dd5d3f8c7623048c9c063d532cc95c5ed7a898a64f"), + }, + { + name: "sha256: valid", + oid: OID("sha256:ef797c8118f02dfb649607dd5d3f8c7623048c9c063d532cc95c5ed7a898a64f"), + expVal: true, + }, + } + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + assert.Equal(t, test.expVal, ValidOID(test.oid)) + }) + } +} diff --git a/internal/lfsutil/storage.go b/internal/lfsutil/storage.go new file mode 100644 index 00000000..fa10ee03 --- /dev/null +++ b/internal/lfsutil/storage.go @@ -0,0 +1,29 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package lfsutil + +import ( + "path/filepath" + "strings" +) + +// Storage is the storage type of an LFS object. +type Storage string + +const ( + StorageLocal Storage = "local" +) + +// StorageLocalPath returns computed file path for storing object on local file system. +// It returns empty string if given "oid" isn't valid. +func StorageLocalPath(root string, oid OID) string { + if !ValidOID(oid) { + return "" + } + + // Valid OID is guaranteed to have second element as hash. + hash := strings.SplitN(string(oid), ":", 2)[1] + return filepath.Join(root, string(hash[0]), string(hash[1]), hash) +} diff --git a/internal/lfsutil/storage_test.go b/internal/lfsutil/storage_test.go new file mode 100644 index 00000000..4f64b92b --- /dev/null +++ b/internal/lfsutil/storage_test.go @@ -0,0 +1,43 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package lfsutil + +import ( + "runtime" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestStorageLocalPath(t *testing.T) { + if runtime.GOOS == "windows" { + t.Skip("Skipping testing on Windows") + return + } + + tests := []struct { + name string + root string + oid OID + expPath string + }{ + { + name: "invalid oid", + oid: OID("bad_oid"), + }, + + { + name: "valid oid", + root: "/lfs-objects", + oid: OID("sha256:ef797c8118f02dfb649607dd5d3f8c7623048c9c063d532cc95c5ed7a898a64f"), + expPath: "/lfs-objects/e/f/ef797c8118f02dfb649607dd5d3f8c7623048c9c063d532cc95c5ed7a898a64f", + }, + } + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + assert.Equal(t, test.expPath, StorageLocalPath(test.root, test.oid)) + }) + } +} diff --git a/internal/route/admin/auths.go b/internal/route/admin/auths.go index bcf52e5e..c5c1e480 100644 --- a/internal/route/admin/auths.go +++ b/internal/route/admin/auths.go @@ -32,7 +32,7 @@ func Authentications(c *context.Context) { c.PageIs("AdminAuthentications") var err error - c.Data["Sources"], err = db.LoginSources() + c.Data["Sources"], err = db.ListLoginSources() if err != nil { c.Error(err, "list login sources") return @@ -49,11 +49,11 @@ type dropdownItem struct { var ( authSources = []dropdownItem{ - {db.LoginNames[db.LOGIN_LDAP], db.LOGIN_LDAP}, - {db.LoginNames[db.LOGIN_DLDAP], db.LOGIN_DLDAP}, - {db.LoginNames[db.LOGIN_SMTP], db.LOGIN_SMTP}, - {db.LoginNames[db.LOGIN_PAM], db.LOGIN_PAM}, - {db.LoginNames[db.LOGIN_GITHUB], db.LOGIN_GITHUB}, + {db.LoginNames[db.LoginLDAP], db.LoginLDAP}, + {db.LoginNames[db.LoginDLDAP], db.LoginDLDAP}, + {db.LoginNames[db.LoginSMTP], db.LoginSMTP}, + {db.LoginNames[db.LoginPAM], db.LoginPAM}, + {db.LoginNames[db.LoginGitHub], db.LoginGitHub}, } securityProtocols = []dropdownItem{ {db.SecurityProtocolNames[ldap.SECURITY_PROTOCOL_UNENCRYPTED], ldap.SECURITY_PROTOCOL_UNENCRYPTED}, @@ -67,8 +67,8 @@ func NewAuthSource(c *context.Context) { c.PageIs("Admin") c.PageIs("AdminAuthentications") - c.Data["type"] = db.LOGIN_LDAP - c.Data["CurrentTypeName"] = db.LoginNames[db.LOGIN_LDAP] + c.Data["type"] = db.LoginLDAP + c.Data["CurrentTypeName"] = db.LoginNames[db.LoginLDAP] c.Data["CurrentSecurityProtocol"] = db.SecurityProtocolNames[ldap.SECURITY_PROTOCOL_UNENCRYPTED] c.Data["smtp_auth"] = "PLAIN" c.Data["is_active"] = true @@ -131,17 +131,17 @@ func NewAuthSourcePost(c *context.Context, f form.Authentication) { hasTLS := false var config core.Conversion switch db.LoginType(f.Type) { - case db.LOGIN_LDAP, db.LOGIN_DLDAP: + case db.LoginLDAP, db.LoginDLDAP: config = parseLDAPConfig(f) hasTLS = ldap.SecurityProtocol(f.SecurityProtocol) > ldap.SECURITY_PROTOCOL_UNENCRYPTED - case db.LOGIN_SMTP: + case db.LoginSMTP: config = parseSMTPConfig(f) hasTLS = true - case db.LOGIN_PAM: + case db.LoginPAM: config = &db.PAMConfig{ ServiceName: f.PAMServiceName, } - case db.LOGIN_GITHUB: + case db.LoginGitHub: config = &db.GitHubConfig{ APIEndpoint: strings.TrimSuffix(f.GitHubAPIEndpoint, "/") + "/", } @@ -186,7 +186,7 @@ func EditAuthSource(c *context.Context) { c.Data["SecurityProtocols"] = securityProtocols c.Data["SMTPAuths"] = db.SMTPAuths - source, err := db.GetLoginSourceByID(c.ParamsInt64(":authid")) + source, err := db.LoginSources.GetByID(c.ParamsInt64(":authid")) if err != nil { c.Error(err, "get login source by ID") return @@ -204,7 +204,7 @@ func EditAuthSourcePost(c *context.Context, f form.Authentication) { c.Data["SMTPAuths"] = db.SMTPAuths - source, err := db.GetLoginSourceByID(c.ParamsInt64(":authid")) + source, err := db.LoginSources.GetByID(c.ParamsInt64(":authid")) if err != nil { c.Error(err, "get login source by ID") return @@ -219,15 +219,15 @@ func EditAuthSourcePost(c *context.Context, f form.Authentication) { var config core.Conversion switch db.LoginType(f.Type) { - case db.LOGIN_LDAP, db.LOGIN_DLDAP: + case db.LoginLDAP, db.LoginDLDAP: config = parseLDAPConfig(f) - case db.LOGIN_SMTP: + case db.LoginSMTP: config = parseSMTPConfig(f) - case db.LOGIN_PAM: + case db.LoginPAM: config = &db.PAMConfig{ ServiceName: f.PAMServiceName, } - case db.LOGIN_GITHUB: + case db.LoginGitHub: config = &db.GitHubConfig{ APIEndpoint: strings.TrimSuffix(f.GitHubAPIEndpoint, "/") + "/", } @@ -252,7 +252,7 @@ func EditAuthSourcePost(c *context.Context, f form.Authentication) { } func DeleteAuthSource(c *context.Context) { - source, err := db.GetLoginSourceByID(c.ParamsInt64(":authid")) + source, err := db.LoginSources.GetByID(c.ParamsInt64(":authid")) if err != nil { c.Error(err, "get login source by ID") return diff --git a/internal/route/admin/users.go b/internal/route/admin/users.go index 630fa4ca..96257c59 100644 --- a/internal/route/admin/users.go +++ b/internal/route/admin/users.go @@ -32,7 +32,7 @@ func Users(c *context.Context) { route.RenderUserSearch(c, &route.UserSearchOptions{ Type: db.USER_TYPE_INDIVIDUAL, Counter: db.CountUsers, - Ranger: db.Users, + Ranger: db.ListUsers, PageSize: conf.UI.Admin.UserPagingNum, OrderBy: "id ASC", TplName: USERS, @@ -46,7 +46,7 @@ func NewUser(c *context.Context) { c.Data["login_type"] = "0-0" - sources, err := db.LoginSources() + sources, err := db.ListLoginSources() if err != nil { c.Error(err, "list login sources") return @@ -62,7 +62,7 @@ func NewUserPost(c *context.Context, f form.AdminCrateUser) { c.Data["PageIsAdmin"] = true c.Data["PageIsAdminUsers"] = true - sources, err := db.LoginSources() + sources, err := db.ListLoginSources() if err != nil { c.Error(err, "list login sources") return @@ -81,7 +81,7 @@ func NewUserPost(c *context.Context, f form.AdminCrateUser) { Email: f.Email, Passwd: f.Password, IsActive: true, - LoginType: db.LOGIN_PLAIN, + LoginType: db.LoginPlain, } if len(f.LoginType) > 0 { @@ -132,7 +132,7 @@ func prepareUserInfo(c *context.Context) *db.User { c.Data["User"] = u if u.LoginSource > 0 { - c.Data["LoginSource"], err = db.GetLoginSourceByID(u.LoginSource) + c.Data["LoginSource"], err = db.LoginSources.GetByID(u.LoginSource) if err != nil { c.Error(err, "get login source by ID") return nil @@ -141,7 +141,7 @@ func prepareUserInfo(c *context.Context) *db.User { c.Data["LoginSource"] = &db.LoginSource{} } - sources, err := db.LoginSources() + sources, err := db.ListLoginSources() if err != nil { c.Error(err, "list login sources") return nil diff --git a/internal/route/api/v1/admin/user.go b/internal/route/api/v1/admin/user.go index c339edd2..06c6569f 100644 --- a/internal/route/api/v1/admin/user.go +++ b/internal/route/api/v1/admin/user.go @@ -23,7 +23,7 @@ func parseLoginSource(c *context.APIContext, u *db.User, sourceID int64, loginNa return } - source, err := db.GetLoginSourceByID(sourceID) + source, err := db.LoginSources.GetByID(sourceID) if err != nil { if errors.IsLoginSourceNotExist(err) { c.ErrorStatus(http.StatusUnprocessableEntity, err) @@ -45,7 +45,7 @@ func CreateUser(c *context.APIContext, form api.CreateUserOption) { Email: form.Email, Passwd: form.Password, IsActive: true, - LoginType: db.LOGIN_PLAIN, + LoginType: db.LoginPlain, } parseLoginSource(c, u, form.SourceID, form.LoginName) diff --git a/internal/route/api/v1/api.go b/internal/route/api/v1/api.go index 01f23d42..1ef21505 100644 --- a/internal/route/api/v1/api.go +++ b/internal/route/api/v1/api.go @@ -55,7 +55,7 @@ func repoAssignment() macaron.Handler { } if c.IsTokenAuth && c.User.IsAdmin { - c.Repo.AccessMode = db.ACCESS_MODE_OWNER + c.Repo.AccessMode = db.AccessModeOwner } else { mode, err := db.UserAccessMode(c.UserID(), r) if err != nil { diff --git a/internal/route/api/v1/repo/repo.go b/internal/route/api/v1/repo/repo.go index 71b94d75..8ac7fd87 100644 --- a/internal/route/api/v1/repo/repo.go +++ b/internal/route/api/v1/repo/repo.go @@ -131,8 +131,8 @@ func listUserRepositories(c *context.APIContext, username string) { i := numOwnRepos for repo, access := range accessibleRepos { repos[i] = repo.APIFormat(&api.Permission{ - Admin: access >= db.ACCESS_MODE_ADMIN, - Push: access >= db.ACCESS_MODE_WRITE, + Admin: access >= db.AccessModeAdmin, + Push: access >= db.AccessModeWrite, Pull: true, }) i++ diff --git a/internal/route/api/v1/user/app.go b/internal/route/api/v1/user/app.go index 99a422cc..98532ae2 100644 --- a/internal/route/api/v1/user/app.go +++ b/internal/route/api/v1/user/app.go @@ -30,8 +30,8 @@ func ListAccessTokens(c *context.APIContext) { func CreateAccessToken(c *context.APIContext, form api.CreateAccessTokenOption) { t := &db.AccessToken{ - UID: c.User.ID, - Name: form.Name, + UserID: c.User.ID, + Name: form.Name, } if err := db.NewAccessToken(t); err != nil { if errors.IsAccessTokenNameAlreadyExist(err) { diff --git a/internal/route/home.go b/internal/route/home.go index 3da7f0cf..86a659d0 100644 --- a/internal/route/home.go +++ b/internal/route/home.go @@ -135,7 +135,7 @@ func ExploreUsers(c *context.Context) { RenderUserSearch(c, &UserSearchOptions{ Type: db.USER_TYPE_INDIVIDUAL, Counter: db.CountUsers, - Ranger: db.Users, + Ranger: db.ListUsers, PageSize: conf.UI.ExplorePagingNum, OrderBy: "updated_unix DESC", TplName: EXPLORE_USERS, diff --git a/internal/route/install.go b/internal/route/install.go index 899393b4..fbb605f0 100644 --- a/internal/route/install.go +++ b/internal/route/install.go @@ -86,9 +86,6 @@ func GlobalInit(customConf string) error { db.InitDeliverHooks() db.InitTestPullRequests() } - if db.EnableSQLite3 { - log.Info("SQLite3 is supported") - } if conf.HasMinWinSvc { log.Info("Builtin Windows Service is supported") } @@ -125,11 +122,7 @@ func InstallInit(c *context.Context) { c.Title("install.install") c.PageIs("Install") - dbOpts := []string{"MySQL", "PostgreSQL", "MSSQL"} - if db.EnableSQLite3 { - dbOpts = append(dbOpts, "SQLite3") - } - c.Data["DbOptions"] = dbOpts + c.Data["DbOptions"] = []string{"MySQL", "PostgreSQL", "MSSQL", "SQLite3"} } func Install(c *context.Context) { @@ -148,9 +141,7 @@ func Install(c *context.Context) { case "mssql": c.Data["CurDbOption"] = "MSSQL" case "sqlite3": - if db.EnableSQLite3 { - c.Data["CurDbOption"] = "SQLite3" - } + c.Data["CurDbOption"] = "SQLite3" } // Application general settings diff --git a/internal/route/lfs/basic.go b/internal/route/lfs/basic.go new file mode 100644 index 00000000..98597345 --- /dev/null +++ b/internal/route/lfs/basic.go @@ -0,0 +1,122 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package lfs + +import ( + "encoding/json" + "io" + "net/http" + "os" + "strconv" + + log "unknwon.dev/clog/v2" + + "gogs.io/gogs/internal/conf" + "gogs.io/gogs/internal/context" + "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/lfsutil" + "gogs.io/gogs/internal/strutil" +) + +const transferBasic = "basic" +const ( + basicOperationUpload = "upload" + basicOperationDownload = "download" +) + +// GET /{owner}/{repo}.git/info/lfs/object/basic/{oid} +func serveBasicDownload(c *context.Context, repo *db.Repository, oid lfsutil.OID) { + object, err := db.LFS.GetObjectByOID(repo.ID, oid) + if err != nil { + if db.IsErrLFSObjectNotExist(err) { + responseJSON(c.Resp, http.StatusNotFound, responseError{ + Message: "Object does not exist", + }) + } else { + internalServerError(c.Resp) + log.Error("Failed to get object [repo_id: %d, oid: %s]: %v", repo.ID, oid, err) + } + return + } + + fpath := lfsutil.StorageLocalPath(conf.LFS.ObjectsPath, object.OID) + r, err := os.Open(fpath) + if err != nil { + internalServerError(c.Resp) + log.Error("Failed to open object file [path: %s]: %v", fpath, err) + return + } + defer r.Close() + + c.Header().Set("Content-Type", "application/octet-stream") + c.Header().Set("Content-Length", strconv.FormatInt(object.Size, 10)) + + _, err = io.Copy(c.Resp, r) + if err != nil { + c.Status(http.StatusInternalServerError) + log.Error("Failed to copy object file: %v", err) + return + } + c.Status(http.StatusOK) +} + +// PUT /{owner}/{repo}.git/info/lfs/object/basic/{oid} +func serveBasicUpload(c *context.Context, repo *db.Repository, oid lfsutil.OID) { + err := db.LFS.CreateObject(repo.ID, oid, c.Req.Request.Body, lfsutil.StorageLocal) + if err != nil { + internalServerError(c.Resp) + log.Error("Failed to create object [repo_id: %d, oid: %s]: %v", repo.ID, oid, err) + return + } + c.Status(http.StatusOK) + + log.Trace("[LFS] Object created %q", oid) +} + +// POST /{owner}/{repo}.git/info/lfs/object/basic/verify +func serveBasicVerify(c *context.Context, repo *db.Repository) { + var request basicVerifyRequest + defer c.Req.Request.Body.Close() + err := json.NewDecoder(c.Req.Request.Body).Decode(&request) + if err != nil { + responseJSON(c.Resp, http.StatusBadRequest, responseError{ + Message: strutil.ToUpperFirst(err.Error()), + }) + return + } + + if !lfsutil.ValidOID(request.Oid) { + responseJSON(c.Resp, http.StatusBadRequest, responseError{ + Message: "Invalid oid", + }) + return + } + + object, err := db.LFS.GetObjectByOID(repo.ID, lfsutil.OID(request.Oid)) + if err != nil { + if db.IsErrLFSObjectNotExist(err) { + responseJSON(c.Resp, http.StatusNotFound, responseError{ + Message: "Object does not exist", + }) + } else { + internalServerError(c.Resp) + log.Error("Failed to get object [repo_id: %d, oid: %s]: %v", repo.ID, request.Oid, err) + } + return + } + + if object.Size != request.Size { + responseJSON(c.Resp, http.StatusNotFound, responseError{ + Message: "Object size mismatch", + }) + return + } + c.Status(http.StatusOK) +} + +type basicVerifyRequest struct { + Oid lfsutil.OID `json:"oid"` + Size int64 `json:"size"` +} diff --git a/internal/route/lfs/batch.go b/internal/route/lfs/batch.go new file mode 100644 index 00000000..ae53f5d3 --- /dev/null +++ b/internal/route/lfs/batch.go @@ -0,0 +1,182 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package lfs + +import ( + "fmt" + "net/http" + + jsoniter "github.com/json-iterator/go" + log "unknwon.dev/clog/v2" + + "gogs.io/gogs/internal/conf" + "gogs.io/gogs/internal/context" + "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/lfsutil" + "gogs.io/gogs/internal/strutil" +) + +// POST /{owner}/{repo}.git/info/lfs/object/batch +func serveBatch(c *context.Context, owner *db.User, repo *db.Repository) { + var request batchRequest + defer c.Req.Request.Body.Close() + err := jsoniter.NewDecoder(c.Req.Request.Body).Decode(&request) + if err != nil { + responseJSON(c.Resp, http.StatusBadRequest, responseError{ + Message: strutil.ToUpperFirst(err.Error()), + }) + return + } + + // NOTE: We only support basic transfer as of now. + transfer := transferBasic + // Example: https://try.gogs.io/gogs/gogs.git/info/lfs/object/basic + baseHref := fmt.Sprintf("%s%s/%s.git/info/lfs/objects/basic", conf.Server.ExternalURL, owner.Name, repo.Name) + + objects := make([]batchObject, 0, len(request.Objects)) + switch request.Operation { + case basicOperationUpload: + for _, obj := range request.Objects { + var actions batchActions + if lfsutil.ValidOID(obj.Oid) { + actions = batchActions{ + Upload: &batchAction{ + Href: fmt.Sprintf("%s/%s", baseHref, obj.Oid), + }, + Verify: &batchAction{ + Href: fmt.Sprintf("%s/verify", baseHref), + }, + } + } else { + actions = batchActions{ + Error: &batchError{ + Code: http.StatusUnprocessableEntity, + Message: "Object has invalid oid", + }, + } + } + + objects = append(objects, batchObject{ + Oid: obj.Oid, + Size: obj.Size, + Actions: actions, + }) + } + + case basicOperationDownload: + oids := make([]lfsutil.OID, 0, len(request.Objects)) + for _, obj := range request.Objects { + oids = append(oids, obj.Oid) + } + stored, err := db.LFS.GetObjectsByOIDs(repo.ID, oids...) + if err != nil { + internalServerError(c.Resp) + log.Error("Failed to get objects [repo_id: %d, oids: %v]: %v", repo.ID, oids, err) + return + } + storedSet := make(map[lfsutil.OID]*db.LFSObject, len(stored)) + for _, obj := range stored { + storedSet[obj.OID] = obj + } + + for _, obj := range request.Objects { + var actions batchActions + if stored := storedSet[obj.Oid]; stored != nil { + if stored.Size != obj.Size { + actions.Error = &batchError{ + Code: http.StatusUnprocessableEntity, + Message: "Object size mismatch", + } + } else { + actions.Download = &batchAction{ + Href: fmt.Sprintf("%s/%s", baseHref, obj.Oid), + } + } + } else { + actions.Error = &batchError{ + Code: http.StatusNotFound, + Message: "Object does not exist", + } + } + + objects = append(objects, batchObject{ + Oid: obj.Oid, + Size: obj.Size, + Actions: actions, + }) + } + + default: + responseJSON(c.Resp, http.StatusBadRequest, responseError{ + Message: "Operation not recognized", + }) + return + } + + responseJSON(c.Resp, http.StatusOK, batchResponse{ + Transfer: transfer, + Objects: objects, + }) +} + +// batchRequest defines the request payload for the batch endpoint. +type batchRequest struct { + Operation string `json:"operation"` + Objects []struct { + Oid lfsutil.OID `json:"oid"` + Size int64 `json:"size"` + } `json:"objects"` +} + +type batchError struct { + Code int `json:"code"` + Message string `json:"message"` +} + +type batchAction struct { + Href string `json:"href"` +} + +type batchActions struct { + Download *batchAction `json:"download,omitempty"` + Upload *batchAction `json:"upload,omitempty"` + Verify *batchAction `json:"verify,omitempty"` + Error *batchError `json:"error,omitempty"` +} + +type batchObject struct { + Oid lfsutil.OID `json:"oid"` + Size int64 `json:"size"` + Actions batchActions `json:"actions"` +} + +// batchResponse defines the response payload for the batch endpoint. +type batchResponse struct { + Transfer string `json:"transfer"` + Objects []batchObject `json:"objects"` +} + +type responseError struct { + Message string `json:"message"` +} + +const contentType = "application/vnd.git-lfs+json" + +func responseJSON(w http.ResponseWriter, status int, v interface{}) { + w.Header().Set("Content-Type", contentType) + + err := jsoniter.NewEncoder(w).Encode(v) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + w.WriteHeader(status) +} + +func internalServerError(w http.ResponseWriter) { + responseJSON(w, http.StatusInternalServerError, responseError{ + Message: "Internal server error", + }) +} diff --git a/internal/route/lfs/route.go b/internal/route/lfs/route.go new file mode 100644 index 00000000..27224265 --- /dev/null +++ b/internal/route/lfs/route.go @@ -0,0 +1,159 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package lfs + +import ( + "net/http" + "strings" + "time" + + "gopkg.in/macaron.v1" + log "unknwon.dev/clog/v2" + + "gogs.io/gogs/internal/authutil" + "gogs.io/gogs/internal/context" + "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/lfsutil" +) + +// RegisterRoutes registers LFS routes using given router, and inherits all groups and middleware. +func RegisterRoutes(r *macaron.Router) { + verifyAccept := verifyHeader("Accept", contentType, http.StatusNotAcceptable) + verifyContentTypeJSON := verifyHeader("Content-Type", contentType, http.StatusBadRequest) + verifyContentTypeStream := verifyHeader("Content-Type", "application/octet-stream", http.StatusBadRequest) + + r.Group("", func() { + r.Post("/objects/batch", authorize(db.AccessModeRead), verifyAccept, verifyContentTypeJSON, serveBatch) + r.Group("/objects/basic", func() { + r.Combo("/:oid", verifyOID()). + Get(authorize(db.AccessModeRead), serveBasicDownload). + Put(authorize(db.AccessModeWrite), verifyContentTypeStream, serveBasicUpload) + r.Post("/verify", authorize(db.AccessModeWrite), verifyAccept, verifyContentTypeJSON, serveBasicVerify) + }) + }, authenticate()) +} + +// authenticate tries to authenticate user via HTTP Basic Auth. +func authenticate() macaron.Handler { + askCredentials := func(w http.ResponseWriter) { + w.Header().Set("LFS-Authenticate", `Basic realm="Git LFS"`) + responseJSON(w, http.StatusUnauthorized, responseError{ + Message: "Credentials needed", + }) + } + + return func(c *context.Context) { + username, password := authutil.DecodeBasic(c.Req.Header) + if username == "" { + askCredentials(c.Resp) + return + } + + user, err := db.Users.Authenticate(username, password, -1) + if err != nil && !db.IsErrUserNotExist(err) { + c.Status(http.StatusInternalServerError) + log.Error("Failed to authenticate user [name: %s]: %v", username, err) + return + } + + if err == nil && user.IsEnabledTwoFactor() { + c.PlainText(http.StatusBadRequest, `Users with 2FA enabled are not allowed to authenticate via username and password.`) + return + } + + // If username and password authentication failed, try again using username as an access token. + if db.IsErrUserNotExist(err) { + token, err := db.AccessTokens.GetBySHA(username) + if err != nil { + if db.IsErrAccessTokenNotExist(err) { + askCredentials(c.Resp) + } else { + c.Status(http.StatusInternalServerError) + log.Error("Failed to get access token [sha: %s]: %v", username, err) + } + return + } + token.Updated = time.Now() + if err = db.AccessTokens.Save(token); err != nil { + log.Error("Failed to update access token: %v", err) + } + + user, err = db.Users.GetByID(token.UserID) + if err != nil { + // Once we found the token, we're supposed to find its related user, + // thus any error is unexpected. + c.Status(http.StatusInternalServerError) + log.Error("Failed to get user: %v", err) + return + } + } + + log.Trace("[LFS] Authenticated user: %s", user.Name) + + c.Map(user) + } +} + +// authorize tries to authorize the user to the context repository with given access mode. +func authorize(mode db.AccessMode) macaron.Handler { + return func(c *context.Context, user *db.User) { + username := c.Params(":username") + reponame := strings.TrimSuffix(c.Params(":reponame"), ".git") + + owner, err := db.Users.GetByUsername(username) + if err != nil { + if db.IsErrUserNotExist(err) { + c.Status(http.StatusNotFound) + } else { + c.Status(http.StatusInternalServerError) + log.Error("Failed to get user [name: %s]: %v", username, err) + } + return + } + + repo, err := db.Repos.GetByName(owner.ID, reponame) + if err != nil { + if db.IsErrRepoNotExist(err) { + c.Status(http.StatusNotFound) + } else { + c.Status(http.StatusInternalServerError) + log.Error("Failed to get repository [owner_id: %d, name: %s]: %v", owner.ID, reponame, err) + } + return + } + + if !db.Perms.Authorize(user.ID, repo, mode) { + c.Status(http.StatusNotFound) + return + } + + c.Map(owner) + c.Map(repo) + } +} + +// verifyHeader checks if the HTTP header value is matching. +// When not, response given "failCode" as status code. +func verifyHeader(key, value string, failCode int) macaron.Handler { + return func(c *context.Context) { + if c.Req.Header.Get(key) != value { + c.Status(failCode) + return + } + } +} + +// verifyOID checks if the ":oid" URL parameter is valid. +func verifyOID() macaron.Handler { + return func(c *context.Context) { + oid := lfsutil.OID(c.Params(":oid")) + if !lfsutil.ValidOID(oid) { + c.PlainText(http.StatusBadRequest, "Invalid oid") + return + } + + c.Map(oid) + } +} diff --git a/internal/route/org/setting.go b/internal/route/org/setting.go index 15b57623..64c30827 100644 --- a/internal/route/org/setting.go +++ b/internal/route/org/setting.go @@ -110,7 +110,7 @@ func SettingsDelete(c *context.Context) { org := c.Org.Organization if c.Req.Method == "POST" { - if _, err := db.UserLogin(c.User.Name, c.Query("password"), c.User.LoginSource); err != nil { + if _, err := db.Users.Authenticate(c.User.Name, c.Query("password"), c.User.LoginSource); err != nil { if db.IsErrUserNotExist(err) { c.RenderWithErr(c.Tr("form.enterred_invalid_password"), SETTINGS_DELETE, nil) } else { diff --git a/internal/route/org/teams.go b/internal/route/org/teams.go index a703a82d..6b0061fc 100644 --- a/internal/route/org/teams.go +++ b/internal/route/org/teams.go @@ -228,11 +228,11 @@ func EditTeamPost(c *context.Context, f form.CreateTeam) { var auth db.AccessMode switch f.Permission { case "read": - auth = db.ACCESS_MODE_READ + auth = db.AccessModeRead case "write": - auth = db.ACCESS_MODE_WRITE + auth = db.AccessModeWrite case "admin": - auth = db.ACCESS_MODE_ADMIN + auth = db.AccessModeAdmin default: c.Status(http.StatusUnauthorized) return diff --git a/internal/route/repo/http.go b/internal/route/repo/http.go index 413b660f..c48cbdb8 100644 --- a/internal/route/repo/http.go +++ b/internal/route/repo/http.go @@ -12,6 +12,7 @@ import ( "os" "os/exec" "path" + "path/filepath" "strconv" "strings" "time" @@ -111,7 +112,7 @@ func HTTPContexter() macaron.Handler { return } - authUser, err := db.UserLogin(authUsername, authPassword, -1) + authUser, err := db.Users.Authenticate(authUsername, authPassword, -1) if err != nil && !db.IsErrUserNotExist(err) { c.Error(err, "authenticate user") return @@ -119,9 +120,9 @@ func HTTPContexter() macaron.Handler { // If username and password combination failed, try again using username as a token. if authUser == nil { - token, err := db.GetAccessTokenBySHA(authUsername) + token, err := db.AccessTokens.GetBySHA(authUsername) if err != nil { - if db.IsErrAccessTokenEmpty(err) || db.IsErrAccessTokenNotExist(err) { + if db.IsErrAccessTokenNotExist(err) { askCredentials(c, http.StatusUnauthorized, "") } else { c.Error(err, "get access token by SHA") @@ -129,9 +130,11 @@ func HTTPContexter() macaron.Handler { return } token.Updated = time.Now() - // TODO: verify or update token.Updated in database + if err = db.AccessTokens.Save(token); err != nil { + log.Error("Failed to update access token: %v", err) + } - authUser, err = db.GetUserByID(token.UID) + authUser, err = db.GetUserByID(token.UserID) if err != nil { // Once we found token, we're supposed to find its related user, // thus any error is unexpected. @@ -146,9 +149,9 @@ Please create and use personal access token on user settings page`) log.Trace("HTTPGit - Authenticated user: %s", authUser.Name) - mode := db.ACCESS_MODE_WRITE + mode := db.AccessModeWrite if isPull { - mode = db.ACCESS_MODE_READ + mode = db.AccessModeRead } has, err := db.HasAccess(authUser.ID, repo, mode) if err != nil { @@ -367,7 +370,7 @@ func getGitRepoPath(dir string) (string, error) { dir += ".git" } - filename := path.Join(conf.Repository.Root, dir) + filename := filepath.Join(conf.Repository.Root, dir) if _, err := os.Stat(filename); os.IsNotExist(err) { return "", err } diff --git a/internal/route/repo/setting.go b/internal/route/repo/setting.go index 1c4446d0..fd281dcc 100644 --- a/internal/route/repo/setting.go +++ b/internal/route/repo/setting.go @@ -513,7 +513,7 @@ func SettingsProtectedBranch(c *context.Context) { c.Data["Users"] = users c.Data["whitelist_users"] = protectBranch.WhitelistUserIDs - teams, err := c.Repo.Owner.TeamsHaveAccessToRepo(c.Repo.Repository.ID, db.ACCESS_MODE_WRITE) + teams, err := c.Repo.Owner.TeamsHaveAccessToRepo(c.Repo.Repository.ID, db.AccessModeWrite) if err != nil { c.Error(err, "get teams have access to the repository") return diff --git a/internal/route/user/auth.go b/internal/route/user/auth.go index a29b6311..22e8176c 100644 --- a/internal/route/user/auth.go +++ b/internal/route/user/auth.go @@ -9,12 +9,12 @@ import ( "net/url" "github.com/go-macaron/captcha" + "github.com/pkg/errors" log "unknwon.dev/clog/v2" "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" "gogs.io/gogs/internal/db" - "gogs.io/gogs/internal/db/errors" "gogs.io/gogs/internal/email" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/tool" @@ -160,13 +160,13 @@ func LoginPost(c *context.Context, f form.SignIn) { return } - u, err := db.UserLogin(f.UserName, f.Password, f.LoginSource) + u, err := db.Users.Authenticate(f.UserName, f.Password, f.LoginSource) if err != nil { - switch err.(type) { + switch errors.Cause(err).(type) { case db.ErrUserNotExist: c.FormErr("UserName", "Password") c.RenderWithErr(c.Tr("form.username_password_incorrect"), LOGIN, &f) - case errors.LoginSourceMismatch: + case db.ErrLoginSourceMismatch: c.FormErr("LoginSource") c.RenderWithErr(c.Tr("form.auth_source_mismatch"), LOGIN, &f) @@ -263,7 +263,7 @@ func LoginTwoFactorRecoveryCodePost(c *context.Context) { } if err := db.UseRecoveryCode(userID, c.Query("recovery_code")); err != nil { - if errors.IsTwoFactorRecoveryCodeNotFound(err) { + if db.IsTwoFactorRecoveryCodeNotFound(err) { c.Flash.Error(c.Tr("auth.login_two_factor_invalid_recovery_code")) c.RedirectSubpath("/user/login/two_factor_recovery_code") } else { diff --git a/internal/route/user/setting.go b/internal/route/user/setting.go index c9ccdc8f..63575c9e 100644 --- a/internal/route/user/setting.go +++ b/internal/route/user/setting.go @@ -608,8 +608,8 @@ func SettingsApplicationsPost(c *context.Context, f form.NewAccessToken) { } t := &db.AccessToken{ - UID: c.User.ID, - Name: f.Name, + UserID: c.User.ID, + Name: f.Name, } if err := db.NewAccessToken(t); err != nil { if errors.IsAccessTokenNameAlreadyExist(err) { @@ -643,7 +643,7 @@ func SettingsDelete(c *context.Context) { c.PageIs("SettingsDelete") if c.Req.Method == "POST" { - if _, err := db.UserLogin(c.User.Name, c.Query("password"), c.User.LoginSource); err != nil { + if _, err := db.Users.Authenticate(c.User.Name, c.Query("password"), c.User.LoginSource); err != nil { if db.IsErrUserNotExist(err) { c.RenderWithErr(c.Tr("form.enterred_invalid_password"), SETTINGS_DELETE, nil) } else { diff --git a/internal/strutil/strutil.go b/internal/strutil/strutil.go new file mode 100644 index 00000000..a2b84a20 --- /dev/null +++ b/internal/strutil/strutil.go @@ -0,0 +1,17 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package strutil + +import ( + "unicode" +) + +// ToUpperFirst returns s with only the first Unicode letter mapped to its upper case. +func ToUpperFirst(s string) string { + for i, v := range s { + return string(unicode.ToUpper(v)) + s[i+1:] + } + return "" +} diff --git a/internal/strutil/strutil_test.go b/internal/strutil/strutil_test.go new file mode 100644 index 00000000..d603533b --- /dev/null +++ b/internal/strutil/strutil_test.go @@ -0,0 +1,43 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package strutil + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestToUpperFirst(t *testing.T) { + tests := []struct { + name string + s string + expStr string + }{ + { + name: "empty string", + }, + { + name: "first letter is a digit", + s: "123 let's go", + expStr: "123 let's go", + }, + { + name: "lower to upper", + s: "this is a sentence", + expStr: "This is a sentence", + }, + { + name: "already in upper case", + s: "Let's go", + expStr: "Let's go", + }, + } + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + assert.Equal(t, test.expStr, ToUpperFirst(test.s)) + }) + } +} diff --git a/internal/testutil/golden.go b/internal/testutil/golden.go index 2aaad5ce..15ac095f 100644 --- a/internal/testutil/golden.go +++ b/internal/testutil/golden.go @@ -29,6 +29,7 @@ func Update(name string) bool { // the golden file on-demand. It does nothing when the runtime is "windows". func AssertGolden(t testing.TB, path string, update bool, got interface{}) { if runtime.GOOS == "windows" { + t.Skip("Skipping testing on Windows") return } |