open-source-mirrors
/
Ombi
mirror of https://github.com/Ombi-app/Ombi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implemented Settings Interface and Models

Browse Source
pull/4510/head
Francesco Servida 3 years ago
parent ce175a8632
commit d4e748fd2f
No known key found for this signature in database
GPG Key ID: 653390DF958E310B
6 changed files with 126 additions and 69 deletions
Show Stats Download Patch File Download Diff File

4
src/Ombi/ClientApp/src/app/auth/auth.service.ts
Unescape View File

@ -28,6 +28,10 @@ export class AuthService extends ServiceHelpers {
return this.http.post<boolean>(`${this.url}/requirePassword`, JSON.stringify(login), { headers: this.headers });
}
public headerAuth(): Observable<any> {
return this.http.post<boolean>(`${this.url}/header_auth`, {}, { headers: this.headers });
}
public getToken() {
return this.jwtHelperService.tokenGetter();
}

2
src/Ombi/ClientApp/src/app/interfaces/ISettings.ts
Unescape View File

@ -238,6 +238,8 @@ export interface IAuthenticationSettings extends ISettings {
requireNonAlphanumeric: boolean;
requireUppercase: boolean;
enableOAuth: boolean;
enableHeaderAuth: boolean;
headerAuthVariable: string;
}
export interface ICustomPage extends ISettings {

30
src/Ombi/ClientApp/src/app/login/login.component.ts
Unescape View File

@ -1,4 +1,4 @@
import { Component, OnDestroy, OnInit, Inject } from "@angular/core";
import { Component, OnDestroy, OnInit, Inject } from "@angular/core";
import { FormBuilder, FormGroup, Validators } from "@angular/forms";
import { ActivatedRoute, Router } from "@angular/router";
import { TranslateService } from "@ngx-translate/core";
@ -106,7 +106,7 @@ export class LoginComponent implements OnDestroy, OnInit {
this.settingsService
.getAuthentication()
.subscribe((x) => (this.authenticationSettings = x));
.subscribe((x) => { this.authenticationSettings = x; this.headerAuth(); });
this.settingsService.getClientId().subscribe((x) => (this.clientId = x));
this.images.getRandomBackground().subscribe((x) => {
this.background = this.sanitizer.bypassSecurityTrustStyle(
@ -121,7 +121,6 @@ export class LoginComponent implements OnDestroy, OnInit {
if (base.length > 1) {
this.baseUrl = base;
}
this.translate
.get("Login.Errors.IncorrectCredentials")
.subscribe((x) => (this.errorBody = x));
@ -255,6 +254,31 @@ export class LoginComponent implements OnDestroy, OnInit {
);
}
public headerAuth() {
if (this.authenticationSettings.enableHeaderAuth) {
this.authService.headerAuth().subscribe(
(x) => {
this.store.save("id_token", x.access_token);
if (this.authService.loggedIn()) {
this.ngOnDestroy();
this.router.navigate(["/"]);
} else {
this.notify.open(this.errorBody, "OK", {
duration: 3000,
});
}
},
(err) => {
this.notify.open(this.errorBody, "OK", {
duration: 3000000,
});
}
);
}
}
public ngOnDestroy() {
clearInterval(this.timer);
clearInterval(this.pinTimer);

121
src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.html
Unescape View File

@ -1,66 +1,81 @@
<settings-menu></settings-menu>
<settings-menu></settings-menu>
<div class="small-middle-container">
<wiki></wiki>
<fieldset *ngIf="form">
<legend>Authentication</legend>
<div class="md-form-field" style="margin-top:1em;"></div>
<form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
<div class="form-group">
<div class="checkbox">
<mat-slide-toggle id="allowNoPassword" name="allowNoPassword" formControlName="allowNoPassword">
Allow users to login without a password</mat-slide-toggle>
</div>
</div>
<div class="form-group">
<div class="checkbox">
<mat-slide-toggle id="allowNoPassword" name="allowNoPassword" formControlName="allowNoPassword">
Allow users to login without a password
</mat-slide-toggle>
</div>
</div>
<div class="form-group">
<div class="checkbox">
<mat-slide-toggle id="enableOAuth" name="enableOAuth" formControlName="enableOAuth">Enable Plex OAuth</mat-slide-toggle>
</div>
</div>
<div class="form-group">
<div class="checkbox">
<mat-slide-toggle id="enableOAuth" name="enableOAuth" formControlName="enableOAuth">Enable Plex OAuth</mat-slide-toggle>
</div>
</div>
<!-- <hr/>
<div class="form-group">
<div class="checkbox">
<input type="checkbox" id="requiredDigit" name="requiredDigit" formControlName="requiredDigit">
<label for="requiredDigit">Require a digit in the password</label>
</div>
</div>
<div class="form-group">
<div class="checkbox">
<mat-slide-toggle id="enableHeaderAuth" name="enableHeaderAuth" formControlName="enableHeaderAuth">Enable Authentication with Header Variable</mat-slide-toggle>
</div>
</div>
<div class="form-group">
<label for="requiredLength" class="control-label">Required password length</label>
<div>
<input type="text" class="form-control form-control-custom " id="requiredLength" name="requiredLength" formControlName="requiredLength">
</div>
</div>
<div class="form-group">
<label for="headerAuthVariable" class="control-label">Header Authentication Variable</label>
<div>
<input type="text" class="form-control form-control-custom " id="headerAuthVariable" name="headerAuthVariable" formControlName="headerAuthVariable">
</div>
</div>
<div class="form-group">
<div class="checkbox">
<input type="checkbox" id="requiredLowercase" name="requiredLowercase" formControlName="requiredLowercase">
<label for="requiredLowercase">Require a lowercase character in the password</label>
</div>
</div>
<!-- <hr/>
<div class="form-group">
<div class="checkbox">
<input type="checkbox" id="requiredDigit" name="requiredDigit" formControlName="requiredDigit">
<label for="requiredDigit">Require a digit in the password</label>
</div>
</div>
<div class="form-group">
<div class="checkbox">
<input type="checkbox" id="requireNonAlphanumeric" name="requireNonAlphanumeric" formControlName="requireNonAlphanumeric">
<label for="requireNonAlphanumeric">Require a NonAlphanumeric character in the password</label>
</div>
</div>
<div class="form-group">
<div class="checkbox">
<input type="checkbox" id="requireUppercase" name="requireUppercase" formControlName="requireUppercase">
<label for="requireUppercase">Require a uppercase character in the password</label>
</div>
</div> -->
<div class="form-group">
<label for="requiredLength" class="control-label">Required password length</label>
<div>
<input type="text" class="form-control form-control-custom " id="requiredLength" name="requiredLength" formControlName="requiredLength">
</div>
</div>
<div class="form-group">
<div>
<button mat-raised-button type="submit" color="primary" [disabled]="form.invalid" class="mat-focus-indicator mat-stroked-button accent mat-accent mat-raised-button mat-button-base" ng-reflect-disabled="false">
<span class="mat-button-wrapper">Submit</span><div matripple="" class="mat-ripple mat-button-ripple" ng-reflect-disabled="false" ng-reflect-centered="false" ng-reflect-trigger="[object HTMLButtonElement]"></div>
<div class="mat-button-focus-overlay"></div></button><div class="md-form-field" style="margin-top:1em;"></div>
</div>
</div>
</form>
<div class="form-group">
<div class="checkbox">
<input type="checkbox" id="requiredLowercase" name="requiredLowercase" formControlName="requiredLowercase">
<label for="requiredLowercase">Require a lowercase character in the password</label>
</div>
</div>
<div class="form-group">
<div class="checkbox">
<input type="checkbox" id="requireNonAlphanumeric" name="requireNonAlphanumeric" formControlName="requireNonAlphanumeric">
<label for="requireNonAlphanumeric">Require a NonAlphanumeric character in the password</label>
</div>
</div>
<div class="form-group">
<div class="checkbox">
<input type="checkbox" id="requireUppercase" name="requireUppercase" formControlName="requireUppercase">
<label for="requireUppercase">Require a uppercase character in the password</label>
</div>
</div> -->
<div class="form-group">
<div>
<button mat-raised-button type="submit" color="primary" [disabled]="form.invalid" class="mat-focus-indicator mat-stroked-button accent mat-accent mat-raised-button mat-button-base" ng-reflect-disabled="false">
<span class="mat-button-wrapper">Submit</span><div matripple="" class="mat-ripple mat-button-ripple" ng-reflect-disabled="false" ng-reflect-centered="false" ng-reflect-trigger="[object HTMLButtonElement]"></div>
<div class="mat-button-focus-overlay"></div>
</button><div class="md-form-field" style="margin-top:1em;"></div>
</div>
</div>
</form>
</fieldset>
</div>
</div>

4
src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.ts
Unescape View File

@ -1,4 +1,4 @@
import { Component, OnInit } from "@angular/core";
import { Component, OnInit } from "@angular/core";
import { FormBuilder, FormGroup } from "@angular/forms";
import { NotificationService } from "../../services";
@ -26,6 +26,8 @@ export class AuthenticationComponent implements OnInit {
requireNonAlphanumeric: [x.requireNonAlphanumeric],
requireUppercase: [x.requireUppercase],
enableOAuth: [x.enableOAuth],
enableHeaderAuth: [x.enableHeaderAuth],
headerAuthVariable: [x.headerAuthVariable],
});
});
}

34
src/Ombi/Controllers/V1/TokenController.cs
Unescape View File

@ -16,6 +16,8 @@ using Ombi.Models.External;
using Ombi.Models.Identity;
using Ombi.Store.Entities;
using Ombi.Store.Repository;
using Ombi.Core.Settings;
using Ombi.Settings.Settings.Models;
namespace Ombi.Controllers.V1
{
@ -25,13 +27,14 @@ namespace Ombi.Controllers.V1
public class TokenController : ControllerBase
{
public TokenController(OmbiUserManager um, IOptions<TokenAuthentication> ta, ITokenRepository token,
IPlexOAuthManager oAuthManager, ILogger<TokenController> logger)
IPlexOAuthManager oAuthManager, ILogger<TokenController> logger, ISettingsService<AuthenticationSettings> auth)
{
_userManager = um;
_tokenAuthenticationOptions = ta.Value;
_token = token;
_plexOAuthManager = oAuthManager;
_log = logger;
_authSettings = auth;
}
private readonly TokenAuthentication _tokenAuthenticationOptions;
@ -39,6 +42,7 @@ namespace Ombi.Controllers.V1
private readonly OmbiUserManager _userManager;
private readonly IPlexOAuthManager _plexOAuthManager;
private readonly ILogger<TokenController> _log;
private readonly ISettingsService<AuthenticationSettings> _authSettings;
/// <summary>
/// Gets the token.
@ -283,25 +287,31 @@ namespace Ombi.Controllers.V1
// TODO
// var ombiSettings = await repo.GetSettingsAsync();
// END TODO
var authSettings = await _authSettings.GetSettingsAsync();
_log.LogInformation("Logging with header: " + authSettings.HeaderAuthVariable);
if (authSettings.HeaderAuthVariable != null)
{
if (Request.HttpContext?.Request?.Headers != null && Request.HttpContext.Request.Headers.ContainsKey(authSettings.HeaderAuthVariable))
{
username = Request.HttpContext.Request.Headers[authSettings.HeaderAuthVariable].ToString();
// Check if user exists
var user = await _userManager.FindByNameAsync(username);
if (user == null)
{
return new UnauthorizedResult();
}
if (Request.HttpContext?.Request?.Headers != null && Request.HttpContext.Request.Headers.ContainsKey("X-Remote-User"))
{
username = Request.HttpContext.Request.Headers["X-Remote-User"].ToString();
// Check if user exists
var user = await _userManager.FindByNameAsync(username);
if (user == null)
return await CreateToken(true, user);
}
else
{
return new UnauthorizedResult();
}
return await CreateToken(true, user);
}
}
else
{
return new UnauthorizedResult();
}
}
}

Write Preview
Loading…
Cancel
Save