Starship/CoreID
1
0
Fork 0
Code Issues 8 Pull Requests Releases 34 Wiki Activity

Make all groups appear in LDAP, get posix GIDs

Browse Source
This commit is contained in:
Garrett Mills 2021-03-10 20:12:06 -06:00
parent ef819b0a2e
commit 48f5b3f71a
Signed by: garrettmills
GPG Key ID: D2BF5FBA8298F246
3 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/controllers/api/v1/Auth.controller.js
View File

@ -260,18 +260,8 @@ class AuthController extends Controller {
group.user_ids = user_ids group.user_ids = user_ids
} }
if ( group.grants_sudo ) {
const Setting = this.models.get('Setting')
let last_uid = await Setting.get('ldap.last_alloc_uid')
if ( last_uid < 1 ) {
last_uid = this.configs.get('ldap:server.schema.start_uid')
}
group.posix_group_id = last_uid + 1
await Setting.set('ldap.last_alloc_uid', group.posix_group_id)
}
await group.save() await group.save()
await group.get_gid_number()
return res.api(await group.to_api()) return res.api(await group.to_api())
} }
@ -381,18 +371,8 @@ class AuthController extends Controller {
group.name = req.body.name group.name = req.body.name
group.grants_sudo = !!req.body.grants_sudo group.grants_sudo = !!req.body.grants_sudo
if ( group.grants_sudo && !group.posix_group_id ) {
const Setting = this.models.get('Setting')
let last_uid = await Setting.get('ldap.last_alloc_uid')
if ( last_uid < 1 ) {
last_uid = this.configs.get('ldap:server.schema.start_uid')
}
group.posix_group_id = last_uid + 1
await Setting.set('ldap.last_alloc_uid', group.posix_group_id)
}
await group.save() await group.save()
await group.get_gid_number()
return res.api() return res.api()
} }

1
app/ldap/controllers/Groups.controller.js
View File

@ -1,4 +1,5 @@
const LDAPController = require('./LDAPController') const LDAPController = require('./LDAPController')
const LDAP = require('ldapjs')
class GroupsController extends LDAPController { class GroupsController extends LDAPController {
static get services() { static get services() {

28
app/models/auth/Group.model.js
View File

@ -32,21 +32,31 @@ class GroupModel extends Model {
return await User.find({ _id: { $in: this.user_ids.map(x => this.constructor.to_object_id(x)) } }) return await User.find({ _id: { $in: this.user_ids.map(x => this.constructor.to_object_id(x)) } })
} }
async get_gid_number() {
if ( !this.posix_group_id ) {
const Setting = this.models.get('Setting')
let last_uid = await Setting.get('ldap.last_alloc_uid')
if ( last_uid < 1 ) {
last_uid = this.configs.get('ldap:server.schema.start_uid')
}
this.posix_group_id = last_uid + 1
await Setting.set('ldap.last_alloc_uid', this.posix_group_id)
await this.save()
}
return this.posix_group_id
}
async to_ldap() { async to_ldap() {
const users = await this.users() const users = await this.users()
const data = { return {
cn: this.name, cn: this.name,
dn: this.dn.format(this.configs.get('ldap:server.format')), dn: this.dn.format(this.configs.get('ldap:server.format')),
objectClass: ['groupOfNames'], objectClass: ['groupOfNames', 'posixGroup'],
gidNumber: await this.get_gid_number(),
member: users.map(x => x.dn.format(this.configs.get('ldap:server.format'))), member: users.map(x => x.dn.format(this.configs.get('ldap:server.format'))),
} }
if ( this.posix_group_id ) {
data.objectClass.push('posixGroup')
data.gidNumber = String(this.posix_group_id)
}
return data
} }
static async ldap_directory() { static async ldap_directory() {