Type:
Task
Priority:
Major
Resolution:
Fixed
As of version 10.5.1, we pass all constants like SELECT_ACL, CREATE_ALC, SUPER_ACL, etc, and their bit-OR combinations using "uint" variables all around the code.
Under terms of MENT-595 , we'll add more privileges, so the uint storage won't be enough, so the code needs to be changed to be ulonglong-compatible.
Instead of simply changing uint to ulonglong, let's introduce a enum to store privilege bits:
enum privilege_t: unsigned long long
{
NO_ACL = (0),
SELECT_ACL = (1UL << 0),
INSERT_ACL = (1UL << 1),
UPDATE_ACL = (1UL << 2),
DELETE_ACL = (1UL << 3),
CREATE_ACL = (1UL << 4),
DROP_ACL = (1UL << 5),
RELOAD_ACL = (1UL << 6),
SHUTDOWN_ACL = (1UL << 7),
PROCESS_ACL = (1UL << 8),
FILE_ACL = (1UL << 9),
GRANT_ACL = (1UL << 10),
REFERENCES_ACL = (1UL << 11),
INDEX_ACL = (1UL << 12),
ALTER_ACL = (1UL << 13),
SHOW_DB_ACL = (1UL << 14),
SUPER_ACL = (1UL << 15),
CREATE_TMP_ACL = (1UL << 16),
LOCK_TABLES_ACL = (1UL << 17),
EXECUTE_ACL = (1UL << 18),
REPL_SLAVE_ACL = (1UL << 19),
REPL_CLIENT_ACL = (1UL << 20),
CREATE_VIEW_ACL = (1UL << 21),
SHOW_VIEW_ACL = (1UL << 22),
CREATE_PROC_ACL = (1UL << 23),
ALTER_PROC_ACL = (1UL << 24),
CREATE_USER_ACL = (1UL << 25),
EVENT_ACL = (1UL << 26),
TRIGGER_ACL = (1UL << 27),
CREATE_TABLESPACE_ACL = (1UL << 28),
DELETE_HISTORY_ACL = (1UL << 29),
ALL_KNOWN_ACL = (1UL << 30) - 1 // A combination of all defined bits
};
To avoid changes in the code, let's define bit-AND, bit-OR operators for the new data type:
static inline constexpr privilege_t operator&(privilege_t a, privilege_t b)
{
return static_cast <privilege_t>( static_cast <ulonglong>(a) &
static_cast <ulonglong>(b));
}
blocks
MDEV-21743
Split up SUPER privilege to smaller privileges
Closed
{"report":{"fcp":1028.4000000059605,"ttfb":180.90000000596046,"pageVisibility":"visible","entityId":83119,"key":"jira.project.issue.view-issue","isInitial":true,"threshold":1000,"elementTimings":{},"userDeviceMemory":8,"userDeviceProcessors":64,"apdex":0.5,"journeyId":"2e128f41-76c8-4b66-8be2-c20299905409","navigationType":0,"readyForUser":1104.6000000238419,"redirectCount":0,"resourceLoadedEnd":1195.6000000238419,"resourceLoadedStart":186.40000000596046,"resourceTiming":[{"duration":230.59999999403954,"initiatorType":"link","name":"https://jira.mariadb.org/s/2c21342762a6a02add1c328bed317ffd-CDN/lu2bv2/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/css/_super/batch.css","startTime":186.40000000596046,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":186.40000000596046,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":417,"responseStart":0,"secureConnectionStart":0},{"duration":230.69999998807907,"initiatorType":"link","name":"https://jira.mariadb.org/s/7ebd35e77e471bc30ff0eba799ebc151-CDN/lu2bv2/820016/12ta74/2380add21a9a1006587582385952de73/_/download/contextbatch/css/jira.browse.project,project.issue.navigator,jira.view.issue,jira.general,jira.global,atl.general,-_super/batch.css?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&slack-enabled=true","startTime":186.60000002384186,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":186.60000002384186,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":417.30000001192093,"responseStart":0,"secureConnectionStart":0},{"duration":239.7999999821186,"initiatorType":"script","name":"https://jira.mariadb.org/s/e9b27a47da5fb0f74a35acd57e9847fb-CDN/lu2bv2/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/js/_super/batch.js?locale=en","startTime":186.7000000178814,"connectEnd":186.7000000178814,"connectStart":186.7000000178814,"domainLookupEnd":186.7000000178814,"domainLookupStart":186.7000000178814,"fetchStart":186.7000000178814,"redirectEnd":0,"redirectStart":0,"requestStart":186.7000000178814,"responseEnd":426.5,"responseStart":426.5,"secureConnectionStart":186.7000000178814},{"duration":485.60000002384186,"initiatorType":"script","name":"https://jira.mariadb.org/s/c32eb0da7ad9831253f8397e6cc26afd-CDN/lu2bv2/820016/12ta74/2380add21a9a1006587582385952de73/_/download/contextbatch/js/jira.browse.project,project.issue.navigator,jira.view.issue,jira.general,jira.global,atl.general,-_super/batch.js?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&locale=en&slack-enabled=true","startTime":187,"connectEnd":187,"connectStart":187,"domainLookupEnd":187,"domainLookupStart":187,"fetchStart":187,"redirectEnd":0,"redirectStart":0,"requestStart":187,"responseEnd":672.6000000238419,"responseStart":672.6000000238419,"secureConnectionStart":187},{"duration":488.69999998807907,"initiatorType":"script","name":"https://jira.mariadb.org/s/bc0bcb146314416123c992714ee00ff7-CDN/lu2bv2/820016/12ta74/c92c0caa9a024ae85b0ebdbed7fb4bd7/_/download/contextbatch/js/atl.global,-_super/batch.js?locale=en","startTime":187.2000000178814,"connectEnd":187.2000000178814,"connectStart":187.2000000178814,"domainLookupEnd":187.2000000178814,"domainLookupStart":187.2000000178814,"fetchStart":187.2000000178814,"redirectEnd":0,"redirectStart":0,"requestStart":187.2000000178814,"responseEnd":675.9000000059605,"responseStart":675.8000000119209,"secureConnectionStart":187.2000000178814},{"duration":489,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bv2/820016/12ta74/1.0/_/download/batch/jira.webresources:calendar-en/jira.webresources:calendar-en.js","startTime":187.30000001192093,"connectEnd":187.30000001192093,"connectStart":187.30000001192093,"domainLookupEnd":187.30000001192093,"domainLookupStart":187.30000001192093,"fetchStart":187.30000001192093,"redirectEnd":0,"redirectStart":0,"requestStart":187.30000001192093,"responseEnd":676.3000000119209,"responseStart":676.3000000119209,"secureConnectionStart":187.30000001192093},{"duration":489.2000000178814,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bv2/820016/12ta74/1.0/_/download/batch/jira.webresources:calendar-localisation-moment/jira.webresources:calendar-localisation-moment.js","startTime":187.5,"connectEnd":187.5,"connectStart":187.5,"domainLookupEnd":187.5,"domainLookupStart":187.5,"fetchStart":187.5,"redirectEnd":0,"redirectStart":0,"requestStart":187.5,"responseEnd":676.7000000178814,"responseStart":676.7000000178814,"secureConnectionStart":187.5},{"duration":490,"initiatorType":"link","name":"https://jira.mariadb.org/s/b04b06a02d1959df322d9cded3aeecc1-CDN/lu2bv2/820016/12ta74/a2ff6aa845ffc9a1d22fe23d9ee791fc/_/download/contextbatch/css/jira.global.look-and-feel,-_super/batch.css","startTime":187.7000000178814,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":187.7000000178814,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":677.7000000178814,"responseStart":0,"secureConnectionStart":0},{"duration":489.30000001192093,"initiatorType":"script","name":"https://jira.mariadb.org/rest/api/1.0/shortcuts/820016/47140b6e0a9bc2e4913da06536125810/shortcuts.js?context=issuenavigation&context=issueaction","startTime":187.80000001192093,"connectEnd":187.80000001192093,"connectStart":187.80000001192093,"domainLookupEnd":187.80000001192093,"domainLookupStart":187.80000001192093,"fetchStart":187.80000001192093,"redirectEnd":0,"redirectStart":0,"requestStart":187.80000001192093,"responseEnd":677.1000000238419,"responseStart":677.1000000238419,"secureConnectionStart":187.80000001192093},{"duration":489.80000001192093,"initiatorType":"link","name":"https://jira.mariadb.org/s/3ac36323ba5e4eb0af2aa7ac7211b4bb-CDN/lu2bv2/820016/12ta74/d176f0986478cc64f24226b3d20c140d/_/download/contextbatch/css/com.atlassian.jira.projects.sidebar.init,-_super,-project.issue.navigator,-jira.view.issue/batch.css?jira.create.linked.issue=true","startTime":188,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":188,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":677.8000000119209,"responseStart":0,"secureConnectionStart":0},{"duration":489.40000000596046,"initiatorType":"script","name":"https://jira.mariadb.org/s/719848dd97ebe0663199f49a3936487a-CDN/lu2bv2/820016/12ta74/d176f0986478cc64f24226b3d20c140d/_/download/contextbatch/js/com.atlassian.jira.projects.sidebar.init,-_super,-project.issue.navigator,-jira.view.issue/batch.js?jira.create.linked.issue=true&locale=en","startTime":188.2000000178814,"connectEnd":188.2000000178814,"connectStart":188.2000000178814,"domainLookupEnd":188.2000000178814,"domainLookupStart":188.2000000178814,"fetchStart":188.2000000178814,"redirectEnd":0,"redirectStart":0,"requestStart":188.2000000178814,"responseEnd":677.6000000238419,"responseStart":677.6000000238419,"secureConnectionStart":188.2000000178814},{"duration":637,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bv2/820016/12ta74/1.0/_/download/batch/jira.webresources:bigpipe-js/jira.webresources:bigpipe-js.js","startTime":189.10000002384186,"connectEnd":189.10000002384186,"connectStart":189.10000002384186,"domainLookupEnd":189.10000002384186,"domainLookupStart":189.10000002384186,"fetchStart":189.10000002384186,"redirectEnd":0,"redirectStart":0,"requestStart":189.10000002384186,"responseEnd":826.1000000238419,"responseStart":826.1000000238419,"secureConnectionStart":189.10000002384186},{"duration":989.9000000059605,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bv2/820016/12ta74/1.0/_/download/batch/jira.webresources:bigpipe-init/jira.webresources:bigpipe-init.js","startTime":193.2000000178814,"connectEnd":193.2000000178814,"connectStart":193.2000000178814,"domainLookupEnd":193.2000000178814,"domainLookupStart":193.2000000178814,"fetchStart":193.2000000178814,"redirectEnd":0,"redirectStart":0,"requestStart":193.2000000178814,"responseEnd":1183.1000000238419,"responseStart":1183.1000000238419,"secureConnectionStart":193.2000000178814},{"duration":253.69999998807907,"initiatorType":"xmlhttprequest","name":"https://jira.mariadb.org/rest/webResources/1.0/resources","startTime":570.8000000119209,"connectEnd":570.8000000119209,"connectStart":570.8000000119209,"domainLookupEnd":570.8000000119209,"domainLookupStart":570.8000000119209,"fetchStart":570.8000000119209,"redirectEnd":0,"redirectStart":0,"requestStart":570.8000000119209,"responseEnd":824.5,"responseStart":824.5,"secureConnectionStart":570.8000000119209},{"duration":258,"initiatorType":"link","name":"https://jira.mariadb.org/s/d5715adaadd168a9002b108b2b039b50-CDN/lu2bv2/820016/12ta74/be4b45e9cec53099498fa61c8b7acba4/_/download/contextbatch/css/jira.project.sidebar,-_super,-project.issue.navigator,-jira.general,-jira.browse.project,-jira.view.issue,-jira.global,-atl.general,-com.atlassian.jira.projects.sidebar.init/batch.css?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&slack-enabled=true","startTime":937.6000000238419,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":937.6000000238419,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":1195.6000000238419,"responseStart":0,"secureConnectionStart":0}],"fetchStart":0,"domainLookupStart":0,"domainLookupEnd":0,"connectStart":0,"connectEnd":0,"requestStart":16,"responseStart":180,"responseEnd":189,"domLoading":184,"domInteractive":1198,"domContentLoadedEventStart":1198,"domContentLoadedEventEnd":1237,"domComplete":2175,"loadEventStart":2175,"loadEventEnd":2177,"userAgent":"Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)","marks":[{"name":"bigPipe.sidebar-id.start","time":1184.800000011921},{"name":"bigPipe.sidebar-id.end","time":1185.6000000238419},{"name":"bigPipe.activity-panel-pipe-id.start","time":1185.800000011921},{"name":"bigPipe.activity-panel-pipe-id.end","time":1188.2000000178814},{"name":"activityTabFullyLoaded","time":1244.300000011921}],"measures":[],"correlationId":"2910e16942da1a","effectiveType":"4g","downlink":10,"rtt":0,"serverDuration":97,"dbReadsTimeInMs":10,"dbConnsTimeInMs":18,"applicationHash":"9d11dbea5f4be3d4cc21f03a88dd11d8c8687422","experiments":[]}}