Commit Graph

130 Commits

Author SHA1 Message Date
4e3ef93fe5 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-18 15:28:08 +02:00
67c9f30632 Added missing NULL byte for resource
Added missing NULL byte for resource
2015-09-18 15:27:36 +02:00
11c4a1a491 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-16 19:09:08 +02:00
fe400e7041 Fixed service permission checks failing without SELECT privilege on mysql.db for the servuce user. 2015-09-16 11:10:24 +03:00
c2c27d7cca Merge from develop
Merge from develop
2015-09-14 09:49:33 +02:00
c11c4733a4 Fixed wrong error message in dbusers 2015-09-12 05:43:32 +03:00
6fe8082445 Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-09-09 10:20:25 +02:00
5350a85e2b Fix to MXS-356: https://mariadb.atlassian.net/browse/MXS-356
Added configurable timeouts for the embedded MySQL connections.
2015-09-08 11:23:35 +03:00
4653830104 Develop merge
Develop merge
2015-09-07 11:13:49 +02:00
160bbb70ee MXS-251: strerror
Replaces all calls to strerror with calls to strerror_r. The former
is non-thread safe while the latter is.
2015-09-05 15:52:13 +03:00
55248ec60e Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-28 16:42:15 +02:00
45227c8875 Changed service permission checks to fail when user doesn't have access rights. 2015-08-28 17:39:45 +03:00
00a3d7eb56 Made service permission checks less strict. 2015-08-28 17:33:05 +03:00
a591b47b9f Merge branch 'develop' into 1.2.1-binlog_router_trx 2015-08-28 16:09:32 +02:00
3a901bfea7 Added automatic configuration of localhost_match_wildcard_host. 2015-08-28 14:55:40 +03:00
c5214bea1b Cleaned up code and changed function structure. 2015-08-28 12:54:38 +03:00
296bdc5df6 Fixed errors and added comments. 2015-08-28 12:54:38 +03:00
525daf827a Service are not started if user permissions are inadequate.
Also cleaned up code and error messages.
2015-08-28 12:54:38 +03:00
cb2b465510 Changed queries to more closely match actual queries. 2015-08-28 12:54:38 +03:00
4da9045da4 Removed redundant function. 2015-08-28 12:54:38 +03:00
94eb1b4eb1 Added service and monitor permission checks. 2015-08-28 12:51:37 +03:00
61c47375d5 Merge branch 'develop' into 1.2.1-binlog_router
Conflicts:
	server/core/server.c
	server/include/server.h
	server/modules/include/blr.h
	server/modules/routing/binlog/blr.c
	server/modules/routing/binlog/blr_file.c
	server/modules/routing/binlog/blr_master.c
	server/modules/routing/binlog/blr_slave.c
2015-08-04 07:59:44 -04:00
9480c01b96 New log messages for dbusers loading failure
New log messages for dbusers loading failure
2015-07-13 18:12:34 +02:00
584ad321ff Fixed possible crash. 2015-07-13 13:22:19 +03:00
4706b756c2 Changed the service resource hashing function into a proper string hashing function. 2015-06-30 19:16:49 +03:00
88940c0097 Fixed wildcard grants not being added to the users table. 2015-06-27 09:47:06 +03:00
4759df9f87 Added proper wildcard database grant detection. 2015-06-27 09:08:20 +03:00
06bece82a8 Fixed multi-character wildcard database grants not working with schemarouter. 2015-05-26 23:08:29 +03:00
1edf7a32cc Added missing strip_db_esc to dbusers.c 2015-05-14 13:43:23 +03:00
39bbc93bbc Changed user addition failure message to mention duplicate users if the user in question was already in the users hash. 2015-04-16 11:02:59 +03:00
d16e4fe134 Added an option for optimization of wildcard grants to individual grants. The default behavior now checks first for specific grants to a database the wildcard grants. 2015-04-15 06:51:52 +03:00
3fb59e020b Added more logging to trace log. 2015-04-09 22:07:53 +03:00
a6ca4a8e0a Merge branch 'wildcard_dbnames' into develop
Conflicts:
	server/core/dbusers.c
2015-04-09 17:12:49 +03:00
71c6ab1d66 Backend databases are queried from all backends before querying users in getAllUsers. 2015-04-07 13:15:48 +03:00
7904b3dcb3 Added doxygen comments to new functions and more logging output when resolving wildcard database names. 2015-04-06 16:14:59 +03:00
0e2d11e487 Fixed missing wildcard character from regex string. 2015-04-06 06:10:17 +03:00
bd68121cc0 Revert "Added resolving of wildcard database grants to multiple single database grants to mysql_client."
This reverts commit 2a416a8cbab5140595f4d2de73d76cefdf3667de.
2015-04-06 05:54:16 +03:00
2a416a8cba Added resolving of wildcard database grants to multiple single database grants to mysql_client. 2015-04-06 05:46:42 +03:00
31a43a846e Fixed log messages not mentioning SHOW DATABASES privilege. 2015-04-01 10:05:54 +03:00
72d48452d5 Fixed a bug with authentication data being loaded too many times. 2015-03-16 13:44:50 +02:00
06318cf0ea Fixed possible error in user authentication from multiple sources. 2015-03-16 11:15:40 +02:00
58b16e1468 Fix to user authentication. 2015-03-13 20:25:04 +02:00
fbedad84af Fixes to Coverity defects. 2015-03-10 17:08:04 +02:00
fc969acc73 Added optional stripping of escape characters from database names when laoding users. 2015-02-20 21:07:12 +02:00
83b7948cdf Added more debug output to user authentication. 2015-02-20 14:50:26 +02:00
a2bff1dcea Merge branch 'develop' into MAX-324 2015-02-16 14:58:35 +02:00
6d1a11637a Fixed typo 2015-02-13 10:18:55 +00:00
d1c2895057 Small fix to how user is retrieved from all servers.
When the authentication was done using the user data from all servers and the set of servers contained a server in the Master state it was possible that some servers weren't queried for their users. This was fixed by adding a check for the parameter that enables this before looking for a master server.
2015-02-13 07:34:46 +02:00
36363b09a1 Added more debug logging and fixed the service resources being overwritted even though they were already allocated. 2015-02-10 14:28:49 +02:00
46ec9abe29 Added optional parameters for services that allow all servers to be used when building the list of users. 2015-02-09 07:19:13 +02:00