StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update interface to begin change to seperate account API keys and application keys

Browse source 
Main difference is permissions, cleaner UI for normal users, and account keys use permissions assigned to servers and subusers while application keys use R/W ACLs stored in the key table.
This commit is contained in:
Dane Everitt 2018-01-14 13:30:55 -06:00
parent 28ebd18f57
commit f9fc3f4370
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
18 changed files with 312 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/Models/ApiKey.php
View file

@ -6,7 +6,6 @@ use Sofa\Eloquence\Eloquence;
use Sofa\Eloquence\Validable;
use Illuminate\Database\Eloquent\Model;
use Pterodactyl\Services\Acl\Api\AdminAcl;
use Illuminate\Contracts\Encryption\Encrypter;
use Sofa\Eloquence\Contracts\CleansAttributes;
use Sofa\Eloquence\Contracts\Validable as ValidableContract;
@ -18,7 +17,7 @@ class ApiKey extends Model implements CleansAttributes, ValidableContract
* Different API keys that can exist on the system.
*/
const TYPE_NONE = 0;
const TYPE_USER = 1;
const TYPE_ACCOUNT = 1;
const TYPE_APPLICATION = 2;
const TYPE_DAEMON_USER = 3;
const TYPE_DAEMON_APPLICATION = 4;
@ -70,6 +69,7 @@ class ApiKey extends Model implements CleansAttributes, ValidableContract
'token',
'allowed_ips',
'memo',
'last_used_at',
];
/**
@ -90,6 +90,7 @@ class ApiKey extends Model implements CleansAttributes, ValidableContract
'memo' => 'required',
'user_id' => 'required',
'token' => 'required',
'key_type' => 'present',
];
/**
@ -99,6 +100,7 @@ class ApiKey extends Model implements CleansAttributes, ValidableContract
*/
protected static $dataIntegrityRules = [
'user_id' => 'exists:users,id',
'key_type' => 'integer|min:0|max:4',
'identifier' => 'string|size:16|unique:api_keys,identifier',
'token' => 'string',
'memo' => 'nullable|string|max:500',
@ -123,14 +125,4 @@ class ApiKey extends Model implements CleansAttributes, ValidableContract
self::UPDATED_AT,
'last_used_at',
];
/**
* Return a decrypted version of the token.
*
* @return string
*/
public function getDecryptedTokenAttribute()
{
return app()->make(Encrypter::class)->decrypt($this->token);
}
}