Kaydet (Commit) c715680c authored tarafından Baran Sekin's avatar Baran Sekin

Refactoring of controllers

üst e08a8e47
......@@ -16,8 +16,8 @@ class LogoutController extends Controller
*/
public function logout()
{
system_log(7,"LOGOUT_SUCCESS");
hook('logout_attempt',[
system_log(7, "LOGOUT_SUCCESS");
hook('logout_attempt', [
"user" => user()
]);
//Logout User
......@@ -25,6 +25,6 @@ class LogoutController extends Controller
session()->flush();
hook('logout_successful');
//Redirect User
return respond(route('login'),300);
return respond(route('login'), 300);
}
}
......@@ -10,47 +10,37 @@ use App\Http\Controllers\Controller;
class MainController extends Controller
{
public function one()
{
}
public function verifyCert()
{
// Check If Certificate Already Added or not.
if(Certificate::where([
if (Certificate::where([
"server_hostname" => request('server_hostname'),
"origin" => request('origin')
])->exists()){
return respond("Bu sunucu ve port için sertifika zaten eklenmiş.",201);
])->exists()) {
return respond("Bu sunucu ve port için sertifika zaten eklenmiş.", 201);
}
$file = "liman-" . request('server_hostname') . "_" . request('origin') . ".crt";
$cert = file_get_contents('/tmp/' . request('path'));
$query = "echo '$cert'| sudo tee /usr/local/share/ca-certificates/" . $file;
shell_exec($query);
shell_exec("echo '$cert'| sudo tee /usr/local/share/ca-certificates/" . $file);
shell_exec("sudo update-ca-certificates");
// Create Certificate Object.
$cert = new Certificate(request()->all());
$cert->save();
$cert = Certificate::create(request()->all());
// Update Admin Notification
$adminNotification = AdminNotification::where('id',request('notification_id'));
if($adminNotification){
$adminNotification->update([
"read" => "true"
]);
}
AdminNotification::where('id', request('notification_id'))->update([
"read" => "true"
]);
return respond("Sertifika Başarıyla Eklendi!",200);
return respond("Sertifika Başarıyla Eklendi!", 200);
}
public function removeCert()
{
$certificate = Certificate::where('id',request('certificate_id'))->first();
if(!$certificate){
abort(504,"Sertifika bulunamadı");
$certificate = Certificate::where('id', request('certificate_id'))->first();
if (!$certificate) {
abort(504, "Sertifika bulunamadı");
}
shell_exec("sudo rm /usr/local/share/ca-certificates/liman-" . $certificate->server_hostname . "_" . $certificate->origin . ".crt");
......@@ -64,36 +54,34 @@ class MainController extends Controller
]);
$certificate->delete();
return respond("Sertifika Başarıyla Silindi!",200);
return respond("Sertifika Başarıyla Silindi!", 200);
}
public function requestCert()
{
list($flag, $message) = retrieveCertificate(request('hostname'),request('port'));
if($flag){
return respond($message,200);
}else{
return respond($message,201);
list($flag, $message) = retrieveCertificate(request('hostname'), request('port'));
if ($flag) {
return respond($message, 200);
} else {
return respond($message, 201);
}
}
public function updateCert()
{
$certificate = Certificate::where('id',request('certificate_id'))->first();
if(!$certificate){
return respond("Sertifika bulunamadı",201);
$certificate = Certificate::where('id', request('certificate_id'))->first();
if (!$certificate) {
return respond("Sertifika bulunamadı", 201);
}
list($flag, $message) = retrieveCertificate($certificate->server_hostname,$certificate->origin);
if(!$flag){
return respond($message,201);
list($flag, $message) = retrieveCertificate($certificate->server_hostname, $certificate->origin);
if (!$flag) {
return respond($message, 201);
}
$file = "liman-" . $certificate->server_hostname . "_" . $certificate->origin . ".crt";
shell_exec('sudo rm /usr/local/share/ca-certificates/ ' . $file);
shell_exec("sudo update-ca-certificates -f");
$cert = file_get_contents('/tmp/' . $message["path"]);
$query = "echo '$cert'| sudo tee /usr/local/share/ca-certificates/" . $file;
$output = shell_exec($query);
shell_exec("echo '$cert'| sudo tee /usr/local/share/ca-certificates/" . $file);
$certificate->save();
shell_exec("sudo update-ca-certificates -f");
return respond("Sertifika Başarıyla Güncellendi!");
......
......@@ -157,21 +157,19 @@ class MainController extends Controller
$extension_folder = env('EXTENSIONS_PATH') . strtolower($json["name"]);
$passPath = env('KEYS_PATH') . DIRECTORY_SEPARATOR . $new->id;
file_put_contents($passPath, Str::random(32));
shell_exec("sudo chown liman:" . cleanDash($new->id) . " " . $passPath);
shell_exec("sudo chmod 640 " . $passPath);
shell_exec("sudo mkdir -p $extension_folder");
shell_exec("sudo cp -r " . $path . "/* " . $extension_folder . DIRECTORY_SEPARATOR);
shell_exec('sudo chown ' . cleanDash($new->id) . ':liman ' . $extension_folder);
shell_exec('sudo chmod 770 ' . $extension_folder);
shell_exec("sudo chown -R " . cleanDash($new->id) . ':liman "' . $extension_folder . '"');
shell_exec("sudo chmod -R 770 \"" . $extension_folder . "\"");
shell_exec("sudo chown liman:" . cleanDash($new->id) . " " . $extension_folder . DIRECTORY_SEPARATOR . "db.json");
shell_exec("sudo chmod 640 " . $extension_folder . DIRECTORY_SEPARATOR . "db.json");
shell_exec("
sudo chown liman:" . cleanDash($new->id) . " $passPath;
sudo chmod 640 $passPath;
sudo mkdir -p $extension_folder;
sudo cp -r " . $path . "/* " . $extension_folder . DIRECTORY_SEPARATOR . ";
sudo chown " . cleanDash($new->id) . ":liman $extension_folder;
sudo chmod 770 $extension_folder;
sudo chown -R " . cleanDash($new->id) . ":liman $extension_folder;
sudo chmod -R 770 $extension_folder;
sudo chown liman:" . cleanDash($new->id) . " " . $extension_folder . DIRECTORY_SEPARATOR . "db.json;
sudo chmod 640 " . $extension_folder . DIRECTORY_SEPARATOR . "db.json;
");
system_log(3, "EXTENSION_UPLOAD_SUCCESS", [
"extension_id" => $new->id
......@@ -224,9 +222,11 @@ class MainController extends Controller
"icon" => ""
];
shell_exec("mkdir " . $folder);
shell_exec("mkdir " . $folder . DIRECTORY_SEPARATOR . "views");
shell_exec("mkdir " . $folder . DIRECTORY_SEPARATOR . "scripts");
shell_exec("
mkdir $folder;
mkdir $folder" . DIRECTORY_SEPARATOR . "views;
mkdir $folder" . DIRECTORY_SEPARATOR . "scripts;
");
touch($folder . DIRECTORY_SEPARATOR . "db.json");
......@@ -238,18 +238,21 @@ class MainController extends Controller
$passPath = env('KEYS_PATH') . DIRECTORY_SEPARATOR . $ext->id;
file_put_contents($passPath, Str::random(32));
shell_exec("sudo chown liman:" . cleanDash($ext->id) . " " . $passPath);
shell_exec("sudo chmod 640 " . $passPath);
shell_exec("
sudo chown liman:" . cleanDash($ext->id) . " $passPath;
sudo chmod 640 $passPath;
");
foreach (sandbox(request('language'))->getInitialFiles() as $file) {
touch($folder . "/views/$file");
}
shell_exec('sudo chown -R ' . cleanDash($ext->id) . ':liman ' . $folder);
shell_exec('sudo chmod -R 770 ' . $folder);
shell_exec("sudo chown liman:" . cleanDash($ext->id) . " " . $folder . DIRECTORY_SEPARATOR . "db.json");
shell_exec("sudo chmod 640 " . $folder . DIRECTORY_SEPARATOR . "db.json");
shell_exec("
sudo chown -R " . cleanDash($ext->id) . ":liman $folder;
sudo chmod -R 770 $folder;
sudo chown liman:" . cleanDash($ext->id) . " $folder" . DIRECTORY_SEPARATOR . "db.json;
sudo chmod 640 $folder" . DIRECTORY_SEPARATOR . "db.json;
");
system_log(6, "EXTENSION_CREATE", [
"extension_id" => $ext->id
......
......@@ -2,28 +2,16 @@
namespace App\Http\Controllers\Extension;
use App\Classes\Connector\SSHTunnelConnector;
use App\Extension;
use App\Permission;
use App\Server;
use App\Http\Controllers\Controller;
use App\User;
use App\UserSettings;
use Carbon\Carbon;
use App\Token;
use function request;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Response;
use Illuminate\Routing\Redirector;
use Illuminate\Support\Facades\DB;
use Illuminate\View\View;
use Illuminate\Support\Str;
use App\ServerLog;
use App\Jobs\ExtensionJob;
use App\JobHistory;
use Illuminate\Contracts\Bus\Dispatcher;
/**
* Class OneController
......
......@@ -9,18 +9,19 @@ use App\Http\Controllers\Controller;
class MainController extends Controller
{
public function all(){
public function all()
{
$requests = LimanRequest::all();
foreach($requests as $request){
foreach ($requests as $request) {
$user = User::find($request->user_id);
if(!$user){
if (!$user) {
$request->user_name = "Kullanici Silinmis";
$request->user_id = "";
}else{
} else {
$request->user_name = $user->name;
$request->user_id = $user->id;
}
switch ($request->type){
switch ($request->type) {
case "server":
$request->type = __("Sunucu");
break;
......@@ -32,9 +33,9 @@ class MainController extends Controller
break;
default:
$request->type = __("Bilinmeyen.");
break;
break;
}
switch ($request->status){
switch ($request->status) {
case "0":
$request->status = __("Talep Alındı");
break;
......@@ -51,7 +52,7 @@ class MainController extends Controller
$request->status = __("Bilinmeyen.");
break;
}
switch ($request->speed){
switch ($request->speed) {
case "normal":
$request->speed = __("Normal");
break;
......@@ -60,31 +61,32 @@ class MainController extends Controller
break;
}
}
system_log(7,"REQUEST_LIST");
system_log(7, "REQUEST_LIST");
return view('permission.list',[
return view('permission.list', [
"requests" => $requests
]);
}
public function one(){
$request = LimanRequest::where('id',request('permission_id'))->first();
$request->user_name = User::where('id',$request->user_id)->first()->name;
public function one()
{
$request = LimanRequest::where('id', request('permission_id'))->first();
$request->user_name = User::where('id', $request->user_id)->first()->name;
system_log(7,"REQUEST_DETAILS",[
system_log(7, "REQUEST_DETAILS", [
"request_id" => $request
]);
return view('permission.requests.' . $request->type ,[
return view('permission.requests.' . $request->type, [
"request" => $request
]);
}
public function requestUpdate()
{
$request = LimanRequest::where('id',request('request_id'))->first();
$request = LimanRequest::where('id', request('request_id'))->first();
system_log(7,"REQUEST_UPDATE",[
system_log(7, "REQUEST_UPDATE", [
"action" => $request
]);
$text = request("status") == "1" ? "İşleniyor." : (request("status") == "2" ? "Tamamlandı" : "Reddedildi");
......@@ -94,13 +96,14 @@ class MainController extends Controller
__("Talebiniz \":status\" olarak güncellendi.", ["status" => __($text)]),
$request->user_id
);
if(request('status') == "4"){
if (request('status') == "4") {
$request->delete();
return respond("Talep Silindi",200);
return respond("Talep Silindi", 200);
}
$request->status = request('status');
$request->save();
return respond("Talep Güncellendi",200);
$request->update([
"status" => request('status')
]);
return respond("Talep Güncellendi", 200);
}
}
......@@ -16,22 +16,22 @@ class RoleController extends Controller
{
public function one(Role $role)
{
return view('settings.role',[
return view('settings.role', [
"role" => $role,
"servers" => Server::find($role->permissions->where('type','server')->pluck('value')->toArray()),
"extensions" => Extension::find($role->permissions->where('type','extension')->pluck('value')->toArray())
"servers" => Server::find($role->permissions->where('type', 'server')->pluck('value')->toArray()),
"extensions" => Extension::find($role->permissions->where('type', 'extension')->pluck('value')->toArray())
]);
}
public function list()
{
return view('table',[
return view('table', [
"value" => Role::all(),
"title" => [
"Rol Grubu Adı", "*hidden*" ,
"Rol Grubu Adı", "*hidden*",
],
"display" => [
"name", "id:role_id" ,
"name", "id:role_id",
],
"menu" => [
"Sil" => [
......@@ -45,7 +45,7 @@ class RoleController extends Controller
public function add()
{
hook('role_group_add_attempt',[
hook('role_group_add_attempt', [
"request" => request()->all()
]);
......@@ -53,17 +53,17 @@ class RoleController extends Controller
'name' => ['required', 'string', 'max:255', 'unique:roles'],
]);
try{
try {
$flag->validate();
}catch (\Exception $exception){
return respond("Lütfen geçerli veri giriniz.",201);
} catch (\Exception $exception) {
return respond("Lütfen geçerli veri giriniz.", 201);
}
$role = Role::create([
"name" => request('name')
]);
hook('role_group_add_successful',[
hook('role_group_add_successful', [
"role" => $role
]);
......@@ -85,33 +85,33 @@ class RoleController extends Controller
public function addRoleUsers()
{
foreach(json_decode(request('users')) as $user){
foreach (json_decode(request('users')) as $user) {
RoleUser::firstOrCreate([
"user_id" => $user,
"role_id" => request('role_id')
]);
}
return respond(__("Grup üyeleri başarıyla eklendi."),200);
return respond(__("Grup üyeleri başarıyla eklendi."), 200);
}
public function addRolesToUser()
{
foreach(json_decode(request('ids')) as $role){
foreach (json_decode(request('ids')) as $role) {
RoleUser::firstOrCreate([
"user_id" => request('user_id'),
"role_id" => $role
]);
}
return respond(__("Rol grupları kullanıcıya başarıyla eklendi."),200);
return respond(__("Rol grupları kullanıcıya başarıyla eklendi."), 200);
}
public function removeRolesToUser()
{
RoleUser::whereIn("role_id", json_decode(request('ids')))
->where([
"user_id" => request('user_id')
])->delete();
return respond(__("Rol grupları başarıyla silindi."),200);
->where([
"user_id" => request('user_id')
])->delete();
return respond(__("Rol grupları başarıyla silindi."), 200);
}
public function removeRoleUsers()
......@@ -120,7 +120,7 @@ class RoleController extends Controller
->where([
"role_id" => request('role_id')
])->delete();
return respond(__("Grup üyeleri başarıyla silindi."),200);
return respond(__("Grup üyeleri başarıyla silindi."), 200);
}
public function getList()
......@@ -129,22 +129,22 @@ class RoleController extends Controller
$data = [];
$title = [];
$display = [];
switch (request('type')){
switch (request('type')) {
case "server":
$data = Server::whereNotIn('id',$role->permissions->where('type','server')->pluck('value')->toArray())->get();
$title = ["*hidden*", "İsim" , "Türü", "İp Adresi"];
$display = ["id:id", "name" , "type", "ip_address"];
$data = Server::whereNotIn('id', $role->permissions->where('type', 'server')->pluck('value')->toArray())->get();
$title = ["*hidden*", "İsim", "Türü", "İp Adresi"];
$display = ["id:id", "name", "type", "ip_address"];
break;
case "extension":
$data = Extension::whereNotIn('id',$role->permissions->where('type','extension')->pluck('value')->toArray())->get();
$data = Extension::whereNotIn('id', $role->permissions->where('type', 'extension')->pluck('value')->toArray())->get();
$title = ["*hidden*", "İsim"];
$display = ["id:id", "name"];
break;
case "liman":
default:
abort(504,"Tip Bulunamadı");
abort(504, "Tip Bulunamadı");
}
return view('l.table',[
return view('l.table', [
"value" => $data,
"title" => $title,
"display" => $display,
......@@ -153,31 +153,33 @@ class RoleController extends Controller
public function addList()
{
foreach(json_decode(request('ids'),true) as $id){
Permission::grant(request('role_id'),request('type'),"id",$id, null, "roles");
foreach (json_decode(request('ids'), true) as $id) {
Permission::grant(request('role_id'), request('type'), "id", $id, null, "roles");
}
return respond(__("Başarılı"),200);
return respond(__("Başarılı"), 200);
}
public function removeFromList()
{
foreach(json_decode(request('ids'),true) as $id){
Permission::revoke(request('role_id'),request('type'),"id",$id);
foreach (json_decode(request('ids'), true) as $id) {
Permission::revoke(request('role_id'), request('type'), "id", $id);
}
return respond(__("Başarılı"),200);
return respond(__("Başarılı"), 200);
}
public function addFunctionPermissions(){
foreach(explode(",",request('functions')) as $function){
Permission::grant(request('role_id'),"function","name",strtolower(extension()->name),$function, "roles");
public function addFunctionPermissions()
{
foreach (explode(",", request('functions')) as $function) {
Permission::grant(request('role_id'), "function", "name", strtolower(extension()->name), $function, "roles");
}
return respond(__("Başarılı"),200);
return respond(__("Başarılı"), 200);
}
public function removeFunctionPermissions(){
foreach(explode(",",request('functions')) as $function){
Permission::find($function)->delete();
public function removeFunctionPermissions()
{
foreach (explode(",", request('functions')) as $function) {
Permission::find($function)->delete();
}
return respond(__("Başarılı"),200);
return respond(__("Başarılı"), 200);
}
}
......@@ -13,11 +13,11 @@ Route::post('/sunucu/ekle', 'Server\AddController@main')->name('server_add')->mi
Route::post('/sunucu/guncelle', 'Server\OneController@update')->name('server_update')->middleware('parameters:server_id,name,control_port,city');
Route::post('/sunucu/erisimKontrolu','Server\MainController@checkAccess')->name('server_check_access')->middleware('parameters:hostname,port');
Route::post('/sunucu/erisimKontrolu', 'Server\MainController@checkAccess')->name('server_check_access')->middleware('parameters:hostname,port');
Route::post('/sunucu/isimKontrol','Server\MainController@verifyName')->name('server_verify_name')->middleware('parameters:server_name');
Route::post('/sunucu/isimKontrol', 'Server\MainController@verifyName')->name('server_verify_name')->middleware('parameters:server_name');
Route::post('/sunucu/anahtarKontrol','Server\MainController@verifyKey')->name('server_verify_key')->middleware('parameters:ip_address,username,password,port');
Route::post('/sunucu/anahtarKontrol', 'Server\MainController@verifyKey')->name('server_verify_key')->middleware('parameters:ip_address,username,password,port');
// Remove Server Route
......@@ -66,51 +66,51 @@ Route::group(['middleware' => ['server']], function () {
//Route::post('/sunucu/yetkilendir', 'Server\OneController@grant')->name('server_grant_permission')->middleware('parameters:server_id,email');
Route::post('/sunucu/favori','Server\OneController@favorite')->name('server_favorite')->middleware('parameters:server_id,action');
Route::post('/sunucu/favori', 'Server\OneController@favorite')->name('server_favorite')->middleware('parameters:server_id,action');
Route::post('/sunucu/durum','Server\OneController@stats')->name('server_stats');
Route::post('/sunucu/durum', 'Server\OneController@stats')->name('server_stats');
Route::post('/sunucu/servis/','Server\OneController@serviceList')->name('server_service_list');
Route::post('/sunucu/servis/', 'Server\OneController@serviceList')->name('server_service_list');
Route::post('/sunucu/yetkili_kullanicilar/','Server\OneController@getSudoers')->name('server_sudoers_list');
Route::post('/sunucu/yetkili_kullanicilar/', 'Server\OneController@getSudoers')->name('server_sudoers_list');
Route::post('/sunucu/yetkili_kullanicilar/ekle','Server\OneController@addSudoers')->name('server_add_sudoers');
Route::post('/sunucu/yetkili_kullanicilar/ekle', 'Server\OneController@addSudoers')->name('server_add_sudoers');
Route::post('/sunucu/yetkili_kullanicilar/sil','Server\OneController@deleteSudoers')->name('server_delete_sudoers');
Route::post('/sunucu/yetkili_kullanicilar/sil', 'Server\OneController@deleteSudoers')->name('server_delete_sudoers');
Route::post('/sunucu/yerel_kullanicilar/','Server\OneController@getLocalUsers')->name('server_local_user_list');
Route::post('/sunucu/yerel_kullanicilar/', 'Server\OneController@getLocalUsers')->name('server_local_user_list');
Route::post('/sunucu/yerel_kullanicilar/ekle','Server\OneController@addLocalUser')->name('server_add_local_user');
Route::post('/sunucu/yerel_kullanicilar/ekle', 'Server\OneController@addLocalUser')->name('server_add_local_user');
Route::post('/sunucu/yerel_gruplar/','Server\OneController@getLocalGroups')->name('server_local_group_list');
Route::post('/sunucu/yerel_gruplar/', 'Server\OneController@getLocalGroups')->name('server_local_group_list');
Route::post('/sunucu/yerel_gruplar/ekle','Server\OneController@addLocalGroup')->name('server_add_local_group');
Route::post('/sunucu/yerel_gruplar/ekle', 'Server\OneController@addLocalGroup')->name('server_add_local_group');
Route::post('/sunucu/yerel_gruplar/kullanicilar','Server\OneController@getLocalGroupDetails')->name('server_local_group_users_list');
Route::post('/sunucu/yerel_gruplar/kullanicilar', 'Server\OneController@getLocalGroupDetails')->name('server_local_group_users_list');
Route::post('/sunucu/yerel_gruplar/kullanicilar/ekle','Server\OneController@addLocalGroupUser')->name('server_add_local_group_user');
Route::post('/sunucu/guncellemeler/','Server\OneController@updateList')->name('server_update_list');
Route::post('/sunucu/yerel_gruplar/kullanicilar/ekle', 'Server\OneController@addLocalGroupUser')->name('server_add_local_group_user');
Route::post('/sunucu/guncellemeler/paket_yukle','Server\OneController@installPackage')->name('server_install_package');
Route::post('/sunucu/guncellemeler/', 'Server\OneController@updateList')->name('server_update_list');
Route::post('/sunucu/guncellemeler/paket_kontrol','Server\OneController@checkPackage')->name('server_check_package');
Route::post('/sunucu/guncellemeler/deb_yukle','Server\OneController@uploadDebFile')->name('server_upload_deb');
Route::post('/sunucu/guncellemeler/paket_yukle', 'Server\OneController@installPackage')->name('server_install_package');
Route::post('/sunucu/gunluk_kayitlari','Server\OneController@getLogs')->name('server_get_logs');
Route::post('/sunucu/guncellemeler/paket_kontrol', 'Server\OneController@checkPackage')->name('server_check_package');
Route::post('/sunucu/paketler','Server\OneController@packageList')->name('server_package_list');
Route::post('/sunucu/guncellemeler/deb_yukle', 'Server\OneController@uploadDebFile')->name('server_upload_deb');
Route::post('/sunucu/yukselt','Server\OneController@upgradeServer')->name('server_upgrade');
Route::post('/sunucu/gunluk_kayitlari', 'Server\OneController@getLogs')->name('server_get_logs');
Route::post('/sunucu/eklentiSil','Server\OneController@removeExtension')->name('server_extension_remove');
Route::post('/sunucu/paketler', 'Server\OneController@packageList')->name('server_package_list');
Route::post('/sunucu/servis/baslat','Server\OneController@startService')->name('server_start_service');
Route::post('/sunucu/yukselt', 'Server\OneController@upgradeServer')->name('server_upgrade');
Route::post('/sunucu/servis/durdur','Server\OneController@stopService')->name('server_stop_service');
Route::post('/sunucu/eklentiSil', 'Server\OneController@removeExtension')->name('server_extension_remove');
Route::post('/sunucu/servis/yenidenBaslat','Server\OneController@restartService')->name('server_restart_service');
Route::post('/sunucu/servis/baslat', 'Server\OneController@startService')->name('server_start_service');
Route::post('/sunucu/acikPortlar','Server\OneController@getOpenPorts')->name('server_get_open_ports');
Route::post('/sunucu/servis/durdur', 'Server\OneController@stopService')->name('server_stop_service');
Route::post('/sunucu/servis/yenidenBaslat', 'Server\OneController@restartService')->name('server_restart_service');
Route::post('/sunucu/acikPortlar', 'Server\OneController@getOpenPorts')->name('server_get_open_ports');
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment