{"action":"created","comment":{"url":"https://api.github.com/repos/owncloud/core/pulls/comments/42514612","id":42514612,"diff_hunk":"@@ -85,19 +85,51 @@ public function getUsers() {\n \tpublic function addUser() {\n \t\t$userId = isset($_POST['userid']) ? $_POST['userid'] : null;\n \t\t$password = isset($_POST['password']) ? $_POST['password'] : null;\n+\t\t$groups = isset($_POST['groups']) ? $_POST['groups'] : null;\n+\t\t$user = $this->userSession->getUser();\n+\t\t$isAdmin = $this->groupManager->isAdmin($user->getUID());\n+\n+\t\tif (!$isAdmin && !\\OC_SubAdmin::isSubAdmin($user->getUID())) {\n+\t\t\treturn new OC_OCS_Result(null, \\OCP\\API::RESPOND_UNAUTHORISED);\n+\t\t}\n+\n \t\tif($this->userManager->userExists($userId)) {\n \t\t\t\\OCP\\Util::writeLog('ocs_api', 'Failed addUser attempt: User already exists.', \\OCP\\Util::ERROR);\n \t\t\treturn new OC_OCS_Result(null, 102, 'User already exists');\n+\t\t}\n+\n+\t\tif(is_array($groups)) {\n+\t\t\tforeach ($groups as $key => $group) {\n+\t\t\t\tif(!$this->groupManager->groupExists($group)){\n+\t\t\t\t\treturn new OC_OCS_Result(null, 104, 'group '.$group.' does not exist');\n+\t\t\t\t}\n+\t\t\t\tif(!$isAdmin && !OC_SubAdmin::isSubAdminofGroup($user->getUID(), $group)) {\n+\t\t\t\t\treturn new OC_OCS_Result(null, 105, 'insufficient privileges for group '. $group);","path":"apps/provisioning_api/lib/users.php","position":23,"original_position":23,"commit_id":"ce0a2aa063b50e95c0d1f01861346245934950ed","original_commit_id":"ce0a2aa063b50e95c0d1f01861346245934950ed","user":{"login":"LukasReschke","id":878997,"avatar_url":"https://avatars.githubusercontent.com/u/878997?v=3","gravatar_id":"","url":"https://api.github.com/users/LukasReschke","html_url":"https://github.com/LukasReschke","followers_url":"https://api.github.com/users/LukasReschke/followers","following_url":"https://api.github.com/users/LukasReschke/following{/other_user}","gists_url":"https://api.github.com/users/LukasReschke/gists{/gist_id}","starred_url":"https://api.github.com/users/LukasReschke/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/LukasReschke/subscriptions","organizations_url":"https://api.github.com/users/LukasReschke/orgs","repos_url":"https://api.github.com/users/LukasReschke/repos","events_url":"https://api.github.com/users/LukasReschke/events{/privacy}","received_events_url":"https://api.github.com/users/LukasReschke/received_events","type":"User","site_admin":false},"body":"Disclosure in a limited way is ok. As in: \"User has actively to request if a group exists\" and we don't do a full listing on it's own.","created_at":"2015-10-20T15:55:06Z","updated_at":"2015-10-20T15:55:06Z","html_url":"https://github.com/owncloud/core/pull/18605#discussion_r42514612","pull_request_url":"https://api.github.com/repos/owncloud/core/pulls/18605","_links":{"self":{"href":"https://api.github.com/repos/owncloud/core/pulls/comments/42514612"},"html":{"href":"https://github.com/owncloud/core/pull/18605#discussion_r42514612"},"pull_request":{"href":"https://api.github.com/repos/owncloud/core/pulls/18605"}}},"pull_request":{"url":"https://api.github.com/repos/owncloud/core/pulls/18605","id":43538453,"html_url":"https://github.com/owncloud/core/pull/18605","diff_url":"https://github.com/owncloud/core/pull/18605.diff","patch_url":"https://github.com/owncloud/core/pull/18605.patch","issue_url":"https://api.github.com/repos/owncloud/core/issues/18605","number":18605,"state":"open","locked":false,"title":"enable api addUser for subadmins","user":{"login":"michag86","id":6691165,"avatar_url":"https://avatars.githubusercontent.com/u/6691165?v=3","gravatar_id":"","url":"https://api.github.com/users/michag86","html_url":"https://github.com/michag86","followers_url":"https://api.github.com/users/michag86/followers","following_url":"https://api.github.com/users/michag86/following{/other_user}","gists_url":"https://api.github.com/users/michag86/gists{/gist_id}","starred_url":"https://api.github.com/users/michag86/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/michag86/subscriptions","organizations_url":"https://api.github.com/users/michag86/orgs","repos_url":"https://api.github.com/users/michag86/repos","events_url":"https://api.github.com/users/michag86/events{/privacy}","received_events_url":"https://api.github.com/users/michag86/received_events","type":"User","site_admin":false},"body":"Make it possible to use addUser from provisioning api for subadmins.  #18382","created_at":"2015-08-27T16:32:29Z","updated_at":"2015-10-20T15:55:06Z","closed_at":null,"merged_at":null,"merge_commit_sha":"c5e3f5ce472bd50a244db2b97f3087dd1c9458f0","assignee":null,"milestone":{"url":"https://api.github.com/repos/owncloud/core/milestones/48","html_url":"https://github.com/owncloud/core/milestones/9.0-next","labels_url":"https://api.github.com/repos/owncloud/core/milestones/48/labels","id":1196845,"number":48,"title":"9.0-next","description":"","creator":{"login":"cmonteroluque","id":879976,"avatar_url":"https://avatars.githubusercontent.com/u/879976?v=3","gravatar_id":"","url":"https://api.github.com/users/cmonteroluque","html_url":"https://github.com/cmonteroluque","followers_url":"https://api.github.com/users/cmonteroluque/followers","following_url":"https://api.github.com/users/cmonteroluque/following{/other_user}","gists_url":"https://api.github.com/users/cmonteroluque/gists{/gist_id}","starred_url":"https://api.github.com/users/cmonteroluque/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cmonteroluque/subscriptions","organizations_url":"https://api.github.com/users/cmonteroluque/orgs","repos_url":"https://api.github.com/users/cmonteroluque/repos","events_url":"https://api.github.com/users/cmonteroluque/events{/privacy}","received_events_url":"https://api.github.com/users/cmonteroluque/received_events","type":"User","site_admin":false},"open_issues":500,"closed_issues":97,"state":"open","created_at":"2015-07-07T14:21:23Z","updated_at":"2015-10-20T15:50:35Z","due_on":"2016-02-09T05:00:00Z","closed_at":null},"commits_url":"https://api.github.com/repos/owncloud/core/pulls/18605/commits","review_comments_url":"https://api.github.com/repos/owncloud/core/pulls/18605/comments","review_comment_url":"https://api.github.com/repos/owncloud/core/pulls/comments{/number}","comments_url":"https://api.github.com/repos/owncloud/core/issues/18605/comments","statuses_url":"https://api.github.com/repos/owncloud/core/statuses/ce0a2aa063b50e95c0d1f01861346245934950ed","head":{"label":"owncloud:api-adduser-for-subadmins","ref":"api-adduser-for-subadmins","sha":"ce0a2aa063b50e95c0d1f01861346245934950ed","user":{"login":"owncloud","id":1645051,"avatar_url":"https://avatars.githubusercontent.com/u/1645051?v=3","gravatar_id":"","url":"https://api.github.com/users/owncloud","html_url":"https://github.com/owncloud","followers_url":"https://api.github.com/users/owncloud/followers","following_url":"https://api.github.com/users/owncloud/following{/other_user}","gists_url":"https://api.github.com/users/owncloud/gists{/gist_id}","starred_url":"https://api.github.com/users/owncloud/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/owncloud/subscriptions","organizations_url":"https://api.github.com/users/owncloud/orgs","repos_url":"https://api.github.com/users/owncloud/repos","events_url":"https://api.github.com/users/owncloud/events{/privacy}","received_events_url":"https://api.github.com/users/owncloud/received_events","type":"Organization","site_admin":false},"repo":{"id":5550552,"name":"core","full_name":"owncloud/core","owner":{"login":"owncloud","id":1645051,"avatar_url":"https://avatars.githubusercontent.com/u/1645051?v=3","gravatar_id":"","url":"https://api.github.com/users/owncloud","html_url":"https://github.com/owncloud","followers_url":"https://api.github.com/users/owncloud/followers","following_url":"https://api.github.com/users/owncloud/following{/other_user}","gists_url":"https://api.github.com/users/owncloud/gists{/gist_id}","starred_url":"https://api.github.com/users/owncloud/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/owncloud/subscriptions","organizations_url":"https://api.github.com/users/owncloud/orgs","repos_url":"https://api.github.com/users/owncloud/repos","events_url":"https://api.github.com/users/owncloud/events{/privacy}","received_events_url":"https://api.github.com/users/owncloud/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/owncloud/core","description":"The ownCloud core","fork":false,"url":"https://api.github.com/repos/owncloud/core","forks_url":"https://api.github.com/repos/owncloud/core/forks","keys_url":"https://api.github.com/repos/owncloud/core/keys{/key_id}","collaborators_url":"https://api.github.com/repos/owncloud/core/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/owncloud/core/teams","hooks_url":"https://api.github.com/repos/owncloud/core/hooks","issue_events_url":"https://api.github.com/repos/owncloud/core/issues/events{/number}","events_url":"https://api.github.com/repos/owncloud/core/events","assignees_url":"https://api.github.com/repos/owncloud/core/assignees{/user}","branches_url":"https://api.github.com/repos/owncloud/core/branches{/branch}","tags_url":"https://api.github.com/repos/owncloud/core/tags","blobs_url":"https://api.github.com/repos/owncloud/core/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/owncloud/core/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/owncloud/core/git/refs{/sha}","trees_url":"https://api.github.com/repos/owncloud/core/git/trees{/sha}","statuses_url":"https://api.github.com/repos/owncloud/core/statuses/{sha}","languages_url":"https://api.github.com/repos/owncloud/core/languages","stargazers_url":"https://api.github.com/repos/owncloud/core/stargazers","contributors_url":"https://api.github.com/repos/owncloud/core/contributors","subscribers_url":"https://api.github.com/repos/owncloud/core/subscribers","subscription_url":"https://api.github.com/repos/owncloud/core/subscription","commits_url":"https://api.github.com/repos/owncloud/core/commits{/sha}","git_commits_url":"https://api.github.com/repos/owncloud/core/git/commits{/sha}","comments_url":"https://api.github.com/repos/owncloud/core/comments{/number}","issue_comment_url":"https://api.github.com/repos/owncloud/core/issues/comments{/number}","contents_url":"https://api.github.com/repos/owncloud/core/contents/{+path}","compare_url":"https://api.github.com/repos/owncloud/core/compare/{base}...{head}","merges_url":"https://api.github.com/repos/owncloud/core/merges","archive_url":"https://api.github.com/repos/owncloud/core/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/owncloud/core/downloads","issues_url":"https://api.github.com/repos/owncloud/core/issues{/number}","pulls_url":"https://api.github.com/repos/owncloud/core/pulls{/number}","milestones_url":"https://api.github.com/repos/owncloud/core/milestones{/number}","notifications_url":"https://api.github.com/repos/owncloud/core/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/owncloud/core/labels{/name}","releases_url":"https://api.github.com/repos/owncloud/core/releases{/id}","created_at":"2012-08-25T10:32:48Z","updated_at":"2015-10-20T11:53:11Z","pushed_at":"2015-10-20T15:50:25Z","git_url":"git://github.com/owncloud/core.git","ssh_url":"git@github.com:owncloud/core.git","clone_url":"https://github.com/owncloud/core.git","svn_url":"https://github.com/owncloud/core","homepage":"https://owncloud.org/","size":1139506,"stargazers_count":3766,"watchers_count":3766,"language":"PHP","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1204,"mirror_url":null,"open_issues_count":1802,"forks":1204,"open_issues":1802,"watchers":3766,"default_branch":"master"}},"base":{"label":"owncloud:master","ref":"master","sha":"b876f8b2a7c40dc23de4849f6a9157ae8150988b","user":{"login":"owncloud","id":1645051,"avatar_url":"https://avatars.githubusercontent.com/u/1645051?v=3","gravatar_id":"","url":"https://api.github.com/users/owncloud","html_url":"https://github.com/owncloud","followers_url":"https://api.github.com/users/owncloud/followers","following_url":"https://api.github.com/users/owncloud/following{/other_user}","gists_url":"https://api.github.com/users/owncloud/gists{/gist_id}","starred_url":"https://api.github.com/users/owncloud/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/owncloud/subscriptions","organizations_url":"https://api.github.com/users/owncloud/orgs","repos_url":"https://api.github.com/users/owncloud/repos","events_url":"https://api.github.com/users/owncloud/events{/privacy}","received_events_url":"https://api.github.com/users/owncloud/received_events","type":"Organization","site_admin":false},"repo":{"id":5550552,"name":"core","full_name":"owncloud/core","owner":{"login":"owncloud","id":1645051,"avatar_url":"https://avatars.githubusercontent.com/u/1645051?v=3","gravatar_id":"","url":"https://api.github.com/users/owncloud","html_url":"https://github.com/owncloud","followers_url":"https://api.github.com/users/owncloud/followers","following_url":"https://api.github.com/users/owncloud/following{/other_user}","gists_url":"https://api.github.com/users/owncloud/gists{/gist_id}","starred_url":"https://api.github.com/users/owncloud/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/owncloud/subscriptions","organizations_url":"https://api.github.com/users/owncloud/orgs","repos_url":"https://api.github.com/users/owncloud/repos","events_url":"https://api.github.com/users/owncloud/events{/privacy}","received_events_url":"https://api.github.com/users/owncloud/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/owncloud/core","description":"The ownCloud core","fork":false,"url":"https://api.github.com/repos/owncloud/core","forks_url":"https://api.github.com/repos/owncloud/core/forks","keys_url":"https://api.github.com/repos/owncloud/core/keys{/key_id}","collaborators_url":"https://api.github.com/repos/owncloud/core/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/owncloud/core/teams","hooks_url":"https://api.github.com/repos/owncloud/core/hooks","issue_events_url":"https://api.github.com/repos/owncloud/core/issues/events{/number}","events_url":"https://api.github.com/repos/owncloud/core/events","assignees_url":"https://api.github.com/repos/owncloud/core/assignees{/user}","branches_url":"https://api.github.com/repos/owncloud/core/branches{/branch}","tags_url":"https://api.github.com/repos/owncloud/core/tags","blobs_url":"https://api.github.com/repos/owncloud/core/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/owncloud/core/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/owncloud/core/git/refs{/sha}","trees_url":"https://api.github.com/repos/owncloud/core/git/trees{/sha}","statuses_url":"https://api.github.com/repos/owncloud/core/statuses/{sha}","languages_url":"https://api.github.com/repos/owncloud/core/languages","stargazers_url":"https://api.github.com/repos/owncloud/core/stargazers","contributors_url":"https://api.github.com/repos/owncloud/core/contributors","subscribers_url":"https://api.github.com/repos/owncloud/core/subscribers","subscription_url":"https://api.github.com/repos/owncloud/core/subscription","commits_url":"https://api.github.com/repos/owncloud/core/commits{/sha}","git_commits_url":"https://api.github.com/repos/owncloud/core/git/commits{/sha}","comments_url":"https://api.github.com/repos/owncloud/core/comments{/number}","issue_comment_url":"https://api.github.com/repos/owncloud/core/issues/comments{/number}","contents_url":"https://api.github.com/repos/owncloud/core/contents/{+path}","compare_url":"https://api.github.com/repos/owncloud/core/compare/{base}...{head}","merges_url":"https://api.github.com/repos/owncloud/core/merges","archive_url":"https://api.github.com/repos/owncloud/core/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/owncloud/core/downloads","issues_url":"https://api.github.com/repos/owncloud/core/issues{/number}","pulls_url":"https://api.github.com/repos/owncloud/core/pulls{/number}","milestones_url":"https://api.github.com/repos/owncloud/core/milestones{/number}","notifications_url":"https://api.github.com/repos/owncloud/core/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/owncloud/core/labels{/name}","releases_url":"https://api.github.com/repos/owncloud/core/releases{/id}","created_at":"2012-08-25T10:32:48Z","updated_at":"2015-10-20T11:53:11Z","pushed_at":"2015-10-20T15:50:25Z","git_url":"git://github.com/owncloud/core.git","ssh_url":"git@github.com:owncloud/core.git","clone_url":"https://github.com/owncloud/core.git","svn_url":"https://github.com/owncloud/core","homepage":"https://owncloud.org/","size":1139506,"stargazers_count":3766,"watchers_count":3766,"language":"PHP","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1204,"mirror_url":null,"open_issues_count":1802,"forks":1204,"open_issues":1802,"watchers":3766,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/owncloud/core/pulls/18605"},"html":{"href":"https://github.com/owncloud/core/pull/18605"},"issue":{"href":"https://api.github.com/repos/owncloud/core/issues/18605"},"comments":{"href":"https://api.github.com/repos/owncloud/core/issues/18605/comments"},"review_comments":{"href":"https://api.github.com/repos/owncloud/core/pulls/18605/comments"},"review_comment":{"href":"https://api.github.com/repos/owncloud/core/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/owncloud/core/pulls/18605/commits"},"statuses":{"href":"https://api.github.com/repos/owncloud/core/statuses/ce0a2aa063b50e95c0d1f01861346245934950ed"}}}}