mirror of
				https://github.com/NginxProxyManager/nginx-proxy-manager.git
				synced 2025-10-31 15:53:33 +00:00 
			
		
		
		
	v2.1.0 (#293)
* Fix wrapping when too many hosts are shown (#207) * Update npm packages, fixes CVE-2019-10757 * Revert some breaking packages * Major overhaul - Docker buildx support in CI - Cypress API Testing in CI - Restructured folder layout (insert clean face meme) - Added Swagger documentation and validate API against that (to be completed) - Use common base image for all supported archs, which includes updated nginx with ipv6 support - Updated certbot and changes required for it - Large amount of Hosts names will wrap in UI - Updated packages for frontend - Version bump 2.1.0 * Updated documentation * Fix JWT expire time going crazy. Now set to 1day * Backend JS formatting rules * Remove v1 importer, I doubt anyone is using v1 anymore * Added backend formatting rules and enforce them in Jenkins builds * Fix CI, doesn't need a tty * Thanks bcrypt. Why can't you just be normal. * Cleanup after syntax check Co-authored-by: Marcelo Castagna <margaale@users.noreply.github.com>
This commit is contained in:
		
							
								
								
									
										85
									
								
								backend/models/auth.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										85
									
								
								backend/models/auth.js
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,85 @@ | ||||
| // Objection Docs: | ||||
| // http://vincit.github.io/objection.js/ | ||||
|  | ||||
| const bcrypt = require('bcrypt'); | ||||
| const db     = require('../db'); | ||||
| const Model  = require('objection').Model; | ||||
| const User   = require('./user'); | ||||
|  | ||||
| Model.knex(db); | ||||
|  | ||||
| function encryptPassword () { | ||||
| 	/* jshint -W040 */ | ||||
| 	let _this = this; | ||||
|  | ||||
| 	if (_this.type === 'password' && _this.secret) { | ||||
| 		return bcrypt.hash(_this.secret, 13) | ||||
| 			.then(function (hash) { | ||||
| 				_this.secret = hash; | ||||
| 			}); | ||||
| 	} | ||||
|  | ||||
| 	return null; | ||||
| } | ||||
|  | ||||
| class Auth extends Model { | ||||
| 	$beforeInsert (queryContext) { | ||||
| 		this.created_on  = Model.raw('NOW()'); | ||||
| 		this.modified_on = Model.raw('NOW()'); | ||||
|  | ||||
| 		// Default for meta | ||||
| 		if (typeof this.meta === 'undefined') { | ||||
| 			this.meta = {}; | ||||
| 		} | ||||
|  | ||||
| 		return encryptPassword.apply(this, queryContext); | ||||
| 	} | ||||
|  | ||||
| 	$beforeUpdate (queryContext) { | ||||
| 		this.modified_on = Model.raw('NOW()'); | ||||
| 		return encryptPassword.apply(this, queryContext); | ||||
| 	} | ||||
|  | ||||
| 	/** | ||||
| 	 * Verify a plain password against the encrypted password | ||||
| 	 * | ||||
| 	 * @param {String} password | ||||
| 	 * @returns {Promise} | ||||
| 	 */ | ||||
| 	verifyPassword (password) { | ||||
| 		return bcrypt.compare(password, this.secret); | ||||
| 	} | ||||
|  | ||||
| 	static get name () { | ||||
| 		return 'Auth'; | ||||
| 	} | ||||
|  | ||||
| 	static get tableName () { | ||||
| 		return 'auth'; | ||||
| 	} | ||||
|  | ||||
| 	static get jsonAttributes () { | ||||
| 		return ['meta']; | ||||
| 	} | ||||
|  | ||||
| 	static get relationMappings () { | ||||
| 		return { | ||||
| 			user: { | ||||
| 				relation:   Model.HasOneRelation, | ||||
| 				modelClass: User, | ||||
| 				join:       { | ||||
| 					from: 'auth.user_id', | ||||
| 					to:   'user.id' | ||||
| 				}, | ||||
| 				filter: { | ||||
| 					is_deleted: 0 | ||||
| 				}, | ||||
| 				modify: function (qb) { | ||||
| 					qb.omit(['is_deleted']); | ||||
| 				} | ||||
| 			} | ||||
| 		}; | ||||
| 	} | ||||
| } | ||||
|  | ||||
| module.exports = Auth; | ||||
		Reference in New Issue
	
	Block a user