Skip to content

irul / opensipkd-base

Go to a project
Commit 1f158947 by aagusti
Options

api

1 parent 1c9f3ec4
Expand all
Inline Side-by-side
Showing 15 changed files with 359 additions and 265 deletions
opensipkd/base/__init__.py
...@@ -66,29 +66,30 @@ titles = {} ...@@ -66,29 +66,30 @@ titles = {}
# http://stackoverflow.com/questions/9845669/pyramid-inverse-to-add-notfound-viewappend-slash-true # http://stackoverflow.com/questions/9845669/pyramid-inverse-to-add-notfound-viewappend-slash-true
class RemoveSlashNotFoundViewFactory(object): # class RemoveSlashNotFoundViewFactory(object):
def __init__(self, notfound_view=None): # diganti menggunakan @view_config(context=HTTPNotFound, renderer='templates/404.pt') pada base.views
if notfound_view is None: # def __init__(self, notfound_view=None):
notfound_view = default_exceptionresponse_view # if notfound_view is None:
self.notfound_view = notfound_view # notfound_view = default_exceptionresponse_view
# self.notfound_view = notfound_view
def __call__(self, context, request): #
if not isinstance(context, Exception): # def __call__(self, context, request):
# backwards compat for an append_notslash_view registered via # if not isinstance(context, Exception):
# config.set_notfound_view instead of as a proper exception view # # backwards compat for an append_notslash_view registered via
context = getattr(request, 'exception', None) or context # # config.set_notfound_view instead of as a proper exception view
path_req = request.path # context = getattr(request, 'exception', None) or context
registry = request.registry # path_req = request.path
mapper = registry.queryUtility(IRoutesMapper) # registry = request.registry
if mapper is not None and path_req.endswith('/'): # mapper = registry.queryUtility(IRoutesMapper)
noslash_path = path_req.rstrip('/') # if mapper is not None and path_req.endswith('/'):
for route in mapper.get_routes(): # noslash_path = path_req.rstrip('/')
if route.match(noslash_path) is not None: # for route in mapper.get_routes():
qs = request.query_string # if route.match(noslash_path) is not None:
if qs: # qs = request.query_string
noslash_path += '?' + qs # if qs:
return HTTPFound(location=noslash_path) # noslash_path += '?' + qs
return self.notfound_view(context, request) # return HTTPFound(location=noslash_path)
# return self.notfound_view(context, request)
# https://groups.google.com/forum/#!topic/pylons-discuss/QIj4G82j04c # https://groups.google.com/forum/#!topic/pylons-discuss/QIj4G82j04c
...@@ -312,11 +313,11 @@ def json_rpc(): ...@@ -312,11 +313,11 @@ def json_rpc():
return json_r return json_r
class MyAuthenticationPolicy(AuthTktAuthenticationPolicy): # class MyAuthenticationPolicy(AuthTktAuthenticationPolicy):
def authenticated_userid(self, request): # def authenticated_userid(self, request):
user = request.user # user = request.user
if user is not None: # if user is not None:
return user.id # return user.id
def get_host(request): def get_host(request):
...@@ -371,35 +372,21 @@ def main(global_config, **settings): ...@@ -371,35 +372,21 @@ def main(global_config, **settings):
config = Configurator(settings=settings, config = Configurator(settings=settings,
root_factory='opensipkd.base.models.RootFactory', root_factory='opensipkd.base.models.RootFactory',
session_factory=session_factory) session_factory=session_factory)
from .models import RootFactory
modules = get_modules(settings) modules = get_modules(settings)
# print(modules)
from importlib import import_module from importlib import import_module
for module in modules: for module in modules:
# compatibility
if module == 'admin': if module == 'admin':
continue continue
module = module.replace('/', '.') module = module.replace('/', '.')
mfile = module mfile = module
print(">>Load Module:", mfile)
m = import_module(mfile) m = import_module(mfile)
cfg = m.main(config, **settings) cfg = m.main(config, **settings)
if cfg: if cfg:
config = cfg config = cfg
# todo apakah config bisa dikirim ke module?
# contoh:
# config = m.config(config)
# dipindahkan ke config pyramid.include
# config.include('pyramid_beaker')
# config.include('pyramid_chameleon')
# authn_policy = AuthTktAuthenticationPolicy(
# 'sosecret', callback=group_finder, hashalg='sha512')
#
# authz_policy = ACLAuthorizationPolicy()
config.set_security_policy(MySecurityPolicy(settings["session.secret"])) config.set_security_policy(MySecurityPolicy(settings["session.secret"]))
# config.set_authentication_policy(authn_policy)
# config.set_security_policy(authz_policy)
# config.set_authorization_policy(authz_policy)
config.add_request_method(get_user, 'user', reify=True) config.add_request_method(get_user, 'user', reify=True)
config.add_request_method(get_title, 'title', reify=True) config.add_request_method(get_title, 'title', reify=True)
config.add_request_method(get_company, 'company', reify=True) config.add_request_method(get_company, 'company', reify=True)
...@@ -421,70 +408,19 @@ def main(global_config, **settings): ...@@ -421,70 +408,19 @@ def main(global_config, **settings):
config.add_request_method(allow_register, 'allow_register', reify=True) config.add_request_method(allow_register, 'allow_register', reify=True)
config.add_request_method(disable_responsive, 'disable_responsive', reify=True) config.add_request_method(disable_responsive, 'disable_responsive', reify=True)
config.add_request_method(get_params, 'get_params', reify=True) config.add_request_method(get_params, 'get_params', reify=True)
# config.add_notfound_view(RemoveSlashNotFoundViewFactory())
config.add_static_view('static', 'opensipkd.base:static', cache_max_age=3600) config.add_static_view('static', 'opensipkd.base:static', cache_max_age=3600)
config.add_static_view('deform_static', 'deform:static') config.add_static_view('deform_static', 'deform:static')
# config.add_view('.views.api.echoGateway')
# config.add_static_view('files', get_params('static_files'))
# Captcha
captcha_files = get_params('captcha_files', settings=settings,alternate="/tmp/captcha") captcha_files = get_params('captcha_files', settings=settings, alternate="/tmp/captcha")
if not os.path.exists(captcha_files): if not os.path.exists(captcha_files):
os.makedirs(captcha_files) os.makedirs(captcha_files)
config.add_static_view('captcha', captcha_files)
# config.add_static_view('tts', path=get_params('tts_files'))
config.add_static_view('captcha', captcha_files)
config.add_renderer('csv', 'opensipkd.tools.CSVRenderer') config.add_renderer('csv', 'opensipkd.tools.CSVRenderer')
config.add_renderer('json', json_renderer()) config.add_renderer('json', json_renderer())
# dipindahkan ke config pyramid.include
# config.include('pyramid_rpc.jsonrpc')
config.add_renderer('json_rpc', json_rpc()) config.add_renderer('json_rpc', json_rpc())
# q = DBSession.query(Route)
# for route in q:
# if route.type == 0:
# config.add_route(route.kode, route.path)
# if route.nama:
# titles[route.kode] = route.nama
# elif route.type == 1:
# config.add_jsonrpc_endpoint(route.kode, route.path,
# default_renderer="json_rpc")
set_routes(config) set_routes(config)
###########################################
# MAP
# todo apabila config bosa di get dari module maka baris ini bisa hilang
# Sudah solve menggunakan includeme
###########################################
# if 'opensipkd.map.base' in modules:
# import papyrus
# from papyrus.renderers import GeoJSON, XSD
#
# config.add_request_method(get_gmap_key, 'gmap_key', reify=True)
# config.add_request_method(get_bing_key, 'bing_key', reify=True)
# config.add_request_method(get_extent, 'extent', reify=True)
#
# config.include(papyrus.includeme)
# config.add_renderer('geojson', GeoJSON())
# config.add_renderer('xsd', XSD())
# config.add_static_view('static_map', 'opensipkd.map.base:static', cache_max_age=3600)
# if 'opensipkd.map.aset' in modules:
# config.add_static_view('static_map_aset', 'opensipkd.map.aset:static', cache_max_age=3600)
#
# # if 'opensipkd.map.pbb' in modules:
# # config.add_static_view('static_map_pbb', 'opensipkd.map.pbb:static', cache_max_age=3600)
#
# if 'opensipkd.pasar.web' in modules:
# config.add_static_view('static_pasar', 'opensipkd.pasar.web:static', cache_max_age=3600)
#
# if 'opensipkd.pbb.master' in modules:
# config.add_static_view('static_pbb', 'opensipkd.pbb.master:static', cache_max_age=3600)
# if 'opensipkd.pos.pbb' in modules:
# config.add_static_view('static_pospbb', 'opensipkd.pos.pbb:static', cache_max_age=3600)
config.registry['mailer'] = mailer_factory_from_settings(settings) config.registry['mailer'] = mailer_factory_from_settings(settings)
# config.include()
config.scan() config.scan()
for m in modules: for m in modules:
config.scan(m) config.scan(m)
......
opensipkd/base/alembic/versions/8e7057155823_penambahan_user_device_expired.py 0 → 100644
"""penambahan user device expired
Revision ID: 8e7057155823
Revises: 86c1b4a1da16
Create Date: 2022-07-08 14:58:39.378811
"""
# revision identifiers, used by Alembic.
revision = '8e7057155823'
down_revision = '86c1b4a1da16'
branch_labels = None
depends_on = None
from alembic import op
import sqlalchemy as sa
def upgrade():
context = op.get_context()
helpers = context.opts['helpers']
if not helpers.table_has_column('user_device', 'expired'):
op.add_column('user_device', sa.Column('expired', sa.DateTime(timezone=True)))
op.alter_column('user_device', sa.Column('expired', sa.DateTime(timezone=True)))
if not helpers.table_has_column('routes', 'create_uid'):
op.add_column('routes', sa.Column('create_uid', sa.Integer, default=0))
if not helpers.table_has_column('routes', 'update_uid'):
op.add_column('routes', sa.Column('update_uid', sa.Integer, default=0))
def downgrade():
pass
opensipkd/base/models/common.py
...@@ -38,8 +38,9 @@ class UserDeviceModel(Base, KodeModel): ...@@ -38,8 +38,9 @@ class UserDeviceModel(Base, KodeModel):
kode = Column(String(256)) kode = Column(String(256))
token = Column(String(256)) token = Column(String(256))
logged_in = Column(Integer) logged_in = Column(Integer)
las_login_date = Column(DateTime) las_login_date = Column(DateTime(timezone=True))
expired = Column(DateTime(timezone=True))
user = relationship(User, backref=backref("devices"))
class ResCompany(Base, NamaModel): class ResCompany(Base, NamaModel):
__tablename__ = 'company' __tablename__ = 'company'
......
opensipkd/base/scripts/initializedb.py
...@@ -258,14 +258,16 @@ def alembic_run(ini_file, name=None): ...@@ -258,14 +258,16 @@ def alembic_run(ini_file, name=None):
if subprocess.call(command) != 0: if subprocess.call(command) != 0:
sys.exit() sys.exit()
def alembic_run(ini_file, name='alembic_base'):
def base_alembic_run(ini_file, name=None):
bin_path = os.path.split(sys.executable)[0] bin_path = os.path.split(sys.executable)[0]
alembic_bin = os.path.join(bin_path, 'alembic') alembic_bin = os.path.join(bin_path, 'alembic')
command = (alembic_bin, '-c', ini_file, '-n', 'alembic_base', 'upgrade', 'head') command = (alembic_bin, '-c', ini_file, '-n', name, 'upgrade', 'head')
if subprocess.call(command) != 0: if subprocess.call(command) != 0:
sys.exit() sys.exit()
def base_alembic_run(ini_file):
alembic_run(ini_file)
def main(argv=sys.argv): def main(argv=sys.argv):
if len(argv) < 2: if len(argv) < 2:
......
opensipkd/base/security.py
import logging import logging
from opensipkd.base.tools.api import rpc_auth
from opensipkd.tools.api import JsonRpcInvalidLoginError
from pyramid.renderers import render_to_response
from .models import ( from .models import (
User, User,
UserGroup, UserGroup,
...@@ -35,6 +40,7 @@ def get_user(request): ...@@ -35,6 +40,7 @@ def get_user(request):
q = DBSession.query(User).filter_by(id=user_id) q = DBSession.query(User).filter_by(id=user_id)
return q.first() return q.first()
# def get_user(request): # def get_user(request):
# user_id = request.unauthenticated_userid # user_id = request.unauthenticated_userid
# if user_id is not None: # if user_id is not None:
...@@ -45,21 +51,18 @@ def get_user(request): ...@@ -45,21 +51,18 @@ def get_user(request):
from pyramid.authentication import AuthTktCookieHelper from pyramid.authentication import AuthTktCookieHelper
from pyramid.authorization import ACLHelper, Authenticated, Everyone from pyramid.authorization import ACLHelper, Authenticated, Everyone
class MySecurityPolicy: class MySecurityPolicy:
def __init__(self, secret): def __init__(self, secret):
self.helper = AuthTktCookieHelper(secret) self.helper = AuthTktCookieHelper(secret)
def identity(self, request): def identity(self, request):
# define our simple identity as None or a dict with userid and principals keys
identity = self.helper.identify(request) identity = self.helper.identify(request)
if identity is None: if identity is None:
return None return None
userid = identity['userid'] # identical to the deprecated request.unauthenticated_userid
# verify the userid, just like we did before with groupfinder userid = identity['userid']
principals = group_finder(userid, request) principals = group_finder(userid, request)
# assuming the userid is valid, return a map with userid and principals
if principals is not None: if principals is not None:
return { return {
'userid': userid, 'userid': userid,
...@@ -67,18 +70,14 @@ class MySecurityPolicy: ...@@ -67,18 +70,14 @@ class MySecurityPolicy:
} }
def authenticated_userid(self, request): def authenticated_userid(self, request):
# defer to the identity logic to determine if the user id logged in
# and return None if they are not
identity = request.identity identity = request.identity
if identity is not None: if identity is not None:
return identity['userid'] return identity['userid']
def permits(self, request, context, permission): def permits(self, request, context, permission):
# use the identity to build a list of principals, and pass them
# to the ACLHelper to determine allowed/denied
identity = request.identity identity = request.identity
principals = set([Everyone]) principals = set([Everyone])
if identity is not None: if identity is not None:
principals.add(Authenticated) principals.add(Authenticated)
principals.add(identity['userid']) principals.add(identity['userid'])
...@@ -90,4 +89,3 @@ class MySecurityPolicy: ...@@ -90,4 +89,3 @@ class MySecurityPolicy:
def forget(self, request, **kw): def forget(self, request, **kw):
return self.helper.forget(request, **kw) return self.helper.forget(request, **kw)
opensipkd/base/tools/__init__.py
from .. import log import logging
log=logging.getLogger(__name__)
log.warning("opensipkd.base.tools depreciated use opensipkd.tools") log.warning("opensipkd.base.tools depreciated use opensipkd.tools")
from opensipkd.tools import * from opensipkd.tools import *
opensipkd/base/tools/api.py
import json import json
from datetime import timedelta, timezone, tzinfo
import requests import requests
from opensipkd.tools import ( from opensipkd.tools import (
get_random_number, devel, get_random_string, get_settings) get_random_number, devel, get_random_string, get_settings, DefaultTimeZone, get_params, get_timezone)
from opensipkd.tools.api import * from opensipkd.tools.api import *
from .. import log
from ..models import (DBSession, User, GroupPermission, UserDeviceModel) from ..models import (DBSession, User, GroupPermission, UserDeviceModel)
import logging
lima_menit = 300 log = logging.getLogger(__name__)
lima_menit = 300
#
def auth_from_rpc(request): def auth_from_rpc(request):
return auth_from(request) return auth_from(request)
def rpc_auth(request):
return auth_from(request)
def auth_from(request, field=None): def auth_from(request, field=None):
global lima_menit global lima_menit
...@@ -43,27 +50,44 @@ def auth_from(request, field=None): ...@@ -43,27 +50,44 @@ def auth_from(request, field=None):
return user return user
# def auth_from_token(request):
def auth_from_token(request): # return auth_from(request, "security_code")
return auth_from(request, "security_code") #
def renew_token(user_device): # def renew_token(user_device, logout=False):
user_device.token = get_random_string(32) # now = datetime.now(tz=get_timezone())
DBSession.add(user_device) # tte = timedelta(minutes=10)
DBSession.flush() # if not user_device.expired or not user_device.token or \
return user_device # now - user_device.expired > tte:
# user_device.expired = now
def get_user_device(request, user): # user_device.token = get_random_string(128)
# if logout:
# user_device.token=""
# DBSession.add(user_device)
# DBSession.flush()
# return user_device
# def token_auth(request, logout=False):
# if not request.environ["HTTP_TOKEN"]:
# raise JsonRpcInvalidLoginError
# user_device = UserDeviceModel.query() \
# .filter_by(kode=request.environ["HTTP_USER_AGENT"],
# token=request.environ["HTTP_TOKEN"]).first()
# if not user_device:
# raise JsonRpcInvalidLoginError
#
# return renew_token(user_device, logout=logout)
def get_user_device(request, user_id):
user_device = UserDeviceModel.query() \ user_device = UserDeviceModel.query() \
.filter_by(user_id=user.id, .filter_by(user_id=user_id,
kode=request.environ["HTTP_USER_AGENT"]).first() kode=request.environ["HTTP_USER_AGENT"]).first()
if not user_device: if not user_device:
user_device = UserDeviceModel() user_device = UserDeviceModel()
user_device.user_id = user.id user_device.user_id = user_id
user_device.kode = request.environ["HTTP_USER_AGENT"] user_device.kode = request.environ["HTTP_USER_AGENT"]
user_device.token = get_random_string(32) # user_device = renew_token(user_device)
DBSession.add(user_device)
DBSession.flush()
return user_device return user_device
...@@ -82,6 +106,7 @@ def validate_time(request): ...@@ -82,6 +106,7 @@ def validate_time(request):
return time_stamp return time_stamp
def auth_device(request): def auth_device(request):
env = request.environ env = request.environ
log.info(env) log.info(env)
......
opensipkd/base/views/__init__.py
...@@ -4,15 +4,20 @@ from datetime import timedelta ...@@ -4,15 +4,20 @@ from datetime import timedelta
import colander import colander
from deform import ( from deform import (
Form, ValidationFailure, widget, Button, ) Form, ValidationFailure, widget, Button, )
from opensipkd.tools.api import JsonRpcInvalidLoginError
from pyramid.httpexceptions import ( from pyramid.httpexceptions import (
HTTPFound, HTTPForbidden, HTTPNotFound, HTTPInternalServerError, HTTPFound, HTTPForbidden, HTTPNotFound, HTTPInternalServerError,
HTTPSeeOther) HTTPSeeOther)
from pyramid.i18n import TranslationStringFactory from pyramid.i18n import TranslationStringFactory
from pyramid.interfaces import IRoutesMapper from pyramid.interfaces import IRoutesMapper
from pyramid.renderers import render_to_response
from pyramid.response import Response from pyramid.response import Response
from pyramid.security import remember
from pyramid.view import view_config from pyramid.view import view_config
from opensipkd.base import get_params from opensipkd.base import get_params
from opensipkd.base.tools.api import rpc_auth
from .base_views import BaseView from .base_views import BaseView
from ..models import ( from ..models import (
DBSession, UserService, ) DBSession, UserService, )
...@@ -74,18 +79,11 @@ class Home(BaseView): ...@@ -74,18 +79,11 @@ class Home(BaseView):
@view_config(context=HTTPForbidden, renderer='templates/403.pt') @view_config(context=HTTPForbidden, renderer='templates/403.pt')
def http_forbidden(request): def http_forbidden(request):
# if request.authenticated_userid: # (request):
# request.session.flash('Hak Akses Terbatas', 'error')
# return HTTPFound(location=request.route_url('home'))
# return HTTPFound(location=request.route_url('login'))
if not request.is_authenticated: if not request.is_authenticated:
next_url = request.route_url('login', _query={'next': request.url}) next_url = request.route_url('login', _query={'next': request.url})
# next_url = f'{get_params("_host").strip()}/{next_url}'
# log.info(next_url)
return HTTPSeeOther(location=next_url) return HTTPSeeOther(location=next_url)
request.response.status = 403
request.response.status = 403
return {"url": request.url} return {"url": request.url}
......
opensipkd/base/views/api.py
...@@ -6,35 +6,7 @@ from ziggurat_foundations.models.services.user import UserService ...@@ -6,35 +6,7 @@ from ziggurat_foundations.models.services.user import UserService
from ..models import Partner, User from ..models import Partner, User
def get_profile_(user):
partner = Partner.query().filter_by(email=user.email).first()
if not partner:
raise JsonRpcInvalidDataError
result = dict(user_name=user.user_name,
nik=partner.kode,
email=partner.email,
mobile=partner.mobile,
nama=partner.nama, )
return dict(data=result)
@jsonrpc_method(method='get_profile', endpoint='rpc-user')
def get_profile(request, data):
"""
Digunakan untuk memperoleh profile user yang sedang login
parameter
@param request: Request
@param data: Dict(user_name=user_name/email, password=password)
@return:
"""
user = request.user
print("User", user)
data = type(data) == list and data[0] or data
user = User.get_by_identity(data["user_name"])
if not user or not UserService.check_password(user, data['password']):
raise JsonRpcInvalidLoginError
return get_profile_(user)
# services = { # services = {
......
opensipkd/base/views/partner_base.py
...@@ -18,6 +18,7 @@ class NamaSchema(colander.Schema): ...@@ -18,6 +18,7 @@ class NamaSchema(colander.Schema):
validator=colander.Length(max=64), validator=colander.Length(max=64),
oid="nama") oid="nama")
class PartnerSchema(NamaSchema): class PartnerSchema(NamaSchema):
alamat_1 = colander.SchemaNode( alamat_1 = colander.SchemaNode(
colander.String(), colander.String(),
......
opensipkd/base/views/templates/_table.pt
<html metal:use-macro="load: ./base3.1.pt"> <html metal:use-macro="load: ./base.pt">
<js metal:fill-slot="js_files"> <js metal:fill-slot="js_files">
<script src="${home}/static/v3/js/plugin/datatables/jquery.dataTables.min.js"></script> <script src="${home}/static/v3/js/plugin/datatables/jquery.dataTables.min.js"></script>
<script src="${home}/static/v3/js/plugin/datatables/dataTables.colVis.min.js"></script> <script src="${home}/static/v3/js/plugin/datatables/dataTables.colVis.min.js"></script>
<script src="${home}/static/v3/js/plugin/datatables/dataTables.tableTools.min.js"></script> <script src="${home}/static/v3/js/plugin/datatables/dataTables.tableTools.min.js"></script>
<script src="${home}/static/v3/js/plugin/datatables/dataTables.bootstrap.min.js"></script> <script src="${home}/static/v3/js/plugin/datatables/dataTables.bootstrap.min.js"></script>
<script src="${home}/static/v3/js/plugin/datatable-responsive/datatables.responsive.min.js"></script> <script src="${home}/static/v3/js/plugin/datatable-responsive/datatables.responsive.min.js"></script>
</js> </js>
</html> </html>
\ No newline at end of file \ No newline at end of file
opensipkd/base/views/user.py
...@@ -94,8 +94,8 @@ class Views(BaseView): ...@@ -94,8 +94,8 @@ class Views(BaseView):
base_path=base_path) base_path=base_path)
filename = os.path.basename(filename) filename = os.path.basename(filename)
resp = pdf_response(self.req, pdf, filename) resp = pdf_response(self.req, pdf, filename)
if resp.content_length<10: if resp.content_length < 10:
resp.content_length=len(resp.body) resp.content_length = len(resp.body)
return resp return resp
return super(Views, self).view_act() return super(Views, self).view_act()
...@@ -238,15 +238,7 @@ class EmailValidator(colander.Email, Validator): ...@@ -238,15 +238,7 @@ class EmailValidator(colander.Email, Validator):
Validator.__init__(self, user) Validator.__init__(self, user)
def __call__(self, node, value): def __call__(self, node, value):
if self.match_object.match(value) is None: def email_found():
raise colander.Invalid(node, _('Invalid email format'))
email = value.lower()
if self.user and self.user.email == email:
return
q = DBSession.query(User).filter_by(email=email)
found = q.first()
if not found:
return
data = dict(email=email, uid=found.id) data = dict(email=email, uid=found.id)
ts = _( ts = _(
'email-already-used', 'email-already-used',
...@@ -254,6 +246,15 @@ class EmailValidator(colander.Email, Validator): ...@@ -254,6 +246,15 @@ class EmailValidator(colander.Email, Validator):
mapping=data) mapping=data)
raise colander.Invalid(node, ts) raise colander.Invalid(node, ts)
if self.match_object.match(value) is None:
raise colander.Invalid(node, _('Invalid email format'))
email = value.lower()
q = DBSession.query(User).filter_by(email=email)
found = q.first()
if found and (not self.user or self.user.email!=found.email):
email_found()
REGEX_ONLY_CONTAIN = re.compile('([A-Za-z0-9-]*)') REGEX_ONLY_CONTAIN = re.compile('([A-Za-z0-9-]*)')
REGEX_BEGIN_END_ALPHANUMERIC = re.compile('^[A-Za-z0-9]+(?:[-][A-Za-z0-9]+)*$') REGEX_BEGIN_END_ALPHANUMERIC = re.compile('^[A-Za-z0-9]+(?:[-][A-Za-z0-9]+)*$')
......
opensipkd/base/views/user_login.py
...@@ -29,13 +29,14 @@ from pyramid.httpexceptions import HTTPFound, HTTPNotFound ...@@ -29,13 +29,14 @@ from pyramid.httpexceptions import HTTPFound, HTTPNotFound
from pyramid.renderers import render_to_response from pyramid.renderers import render_to_response
from pyramid.security import remember, forget from pyramid.security import remember, forget
from pyramid.view import view_config from pyramid.view import view_config
from ziggurat_foundations.models.services.external_identity import ExternalIdentityService from ziggurat_foundations.models.services.external_identity import \
ExternalIdentityService
from ziggurat_foundations.models.services.user import UserService from ziggurat_foundations.models.services.user import UserService
from opensipkd.base import DBSession, get_params from opensipkd.base import DBSession, get_params
from opensipkd.base.models import User, ExternalIdentity from opensipkd.base.models import User, ExternalIdentity
from opensipkd.tools import create_now, set_user_log, get_settings from opensipkd.tools import create_now, set_user_log, get_settings
from opensipkd.base.views import _, one_hour, two_minutes from opensipkd.base.views import _, one_hour, two_minutes, BaseView
from pyramid_mailer.message import Message from pyramid_mailer.message import Message
log = __import__("logging").getLogger(__name__) log = __import__("logging").getLogger(__name__)
...@@ -60,13 +61,15 @@ def get_login_headers(request, user): ...@@ -60,13 +61,15 @@ def get_login_headers(request, user):
return headers return headers
@view_config(route_name='login', renderer='templates/login.pt') class Views(BaseView):
def view_login(request): @view_config(route_name='login', renderer='templates/login.pt')
request.session["login"]=True def view_login(self):
request = self.req
request.session["login"] = True
next_url = request.params.get('next', request.referrer) next_url = request.params.get('next', request.referrer)
login_tpl = get_params('login_tpl', 'templates/login.pt') login_tpl = get_params('login_tpl', 'templates/login.pt')
if not next_url: if not next_url:
next_url = request.route_url('home') # get_params('_host')+ next_url = request.route_url('home')
if request.authenticated_userid: # (request): if request.authenticated_userid: # (request):
request.session.flash('Anda sudah login', 'error') request.session.flash('Anda sudah login', 'error')
...@@ -107,7 +110,8 @@ def view_login(request): ...@@ -107,7 +110,8 @@ def view_login(request):
return HTTPFound(location=request.route_url('login')) return HTTPFound(location=request.route_url('login'))
else: else:
if not user or not UserService.check_password(user, values['password']): if not user or not UserService.check_password(user, values[
'password']):
msg = "Login Gagal" msg = "Login Gagal"
set_user_log(msg, request, log, identity) set_user_log(msg, request, log, identity)
request.session.flash(msg, "error") request.session.flash(msg, "error")
...@@ -125,7 +129,8 @@ def view_login(request): ...@@ -125,7 +129,8 @@ def view_login(request):
del request.session['login failed'] del request.session['login failed']
return r return r
elif "provider_name" in request.params and request.params["provider_name"]: elif "provider_name" in request.params and request.params[
"provider_name"]:
provider_name = request.params["provider_name"] provider_name = request.params["provider_name"]
if provider_name == "google": if provider_name == "google":
from .base_google import googlesignin from .base_google import googlesignin
...@@ -137,7 +142,8 @@ def view_login(request): ...@@ -137,7 +142,8 @@ def view_login(request):
return render_to_response(login_tpl, return render_to_response(login_tpl,
dict(form=form.render(), dict(form=form.render(),
message=message, message=message,
url=request.route_url('login'), url=request.route_url(
'login'),
next_url=next_url, next_url=next_url,
login=login, ), login=login, ),
request=request) request=request)
...@@ -159,22 +165,16 @@ def view_login(request): ...@@ -159,22 +165,16 @@ def view_login(request):
else: else:
message = "User anda masih menunggu verifikasi atau lagi di blokir" message = "User anda masih menunggu verifikasi atau lagi di blokir"
request.session.flash(message, "error") request.session.flash(message, "error")
# if "g_state" in request.cookies: login = ""
# requests.post("https://accounts.google.com/o/oauth2/revoke?token=" + ACCESS_TOKEN); return render_to_response(
# headers = forget(request) renderer_name=login_tpl,
# request.session.delete() request=request,
# request.session["start"]="login" value=dict(form=form.render(),
login=""
return render_to_response(login_tpl,
dict(form=form.render(),
message=message, message=message,
url=request.route_url('login'), url=request.route_url('login'),
next_url=next_url, next_url=next_url,
login=login, ), login=login, ),
request=request) )
# return dict(
# )
def redirect_login(request, user): def redirect_login(request, user):
...@@ -200,7 +200,12 @@ def view_logout(request): ...@@ -200,7 +200,12 @@ def view_logout(request):
request.session.delete() request.session.delete()
if "g_state" in request.cookies: if "g_state" in request.cookies:
del request.cookies["g_state"] del request.cookies["g_state"]
return HTTPFound(location=f"{request.route_url('home')}", # if "g_state" in request.cookies:
# requests.post("https://accounts.google.com/o/oauth2/revoke?token=" + ACCESS_TOKEN);
# headers = forget(request)
# request.session.delete()
# request.session["start"]="login"
return HTTPFound(location=request.route_url('home'),
headers=headers) headers=headers)
return dict() return dict()
...@@ -210,14 +215,25 @@ class ChangePassword(colander.Schema): ...@@ -210,14 +215,25 @@ class ChangePassword(colander.Schema):
colander.String(), widget=widget.PasswordWidget()) colander.String(), widget=widget.PasswordWidget())
retype_password = colander.SchemaNode( retype_password = colander.SchemaNode(
colander.String(), widget=widget.PasswordWidget()) colander.String(), widget=widget.PasswordWidget())
password = colander.SchemaNode(colander.String(),
title=_("Old Password"))
def change_password_validator(form, value): def change_password_validator(form, value):
exc = colander.Invalid(form, '')
user = form.request.user
if not UserService.check_password(user, value["password"]):
exc["password"] = 'Login Failed'
raise exc
if value['new_password'] != value['retype_password']: if value['new_password'] != value['retype_password']:
raise colander.Invalid(form, 'Retype mismatch.') exc["new_password"] = 'Retype mismatch.'
exc["retype_password"] = 'Retype mismatch.'
raise exc
@view_config(route_name='change-password', renderer='templates/change-password.pt') @view_config(route_name='change-password',
renderer='templates/change-password.pt')
def view_change_password(request): def view_change_password(request):
if request.authenticated_userid: if request.authenticated_userid:
request.session.flash('Anda sudah login', 'error') request.session.flash('Anda sudah login', 'error')
...@@ -265,7 +281,8 @@ def generate_api_key(): ...@@ -265,7 +281,8 @@ def generate_api_key():
@view_config( @view_config(
route_name='recreate-api-key', renderer='templates/recreate-api-key.pt', permission='view') route_name='recreate-api-key', renderer='templates/recreate-api-key.pt',
permission='view')
def view_recreate_api_key(request): def view_recreate_api_key(request):
if not request.user.api_key: if not request.user.api_key:
return HTTPNotFound() return HTTPNotFound()
...@@ -374,7 +391,8 @@ def regenerate_security_code(user): ...@@ -374,7 +391,8 @@ def regenerate_security_code(user):
return one_hour return one_hour
@view_config(route_name='reset-password', renderer='templates/reset-password.pt') @view_config(route_name='reset-password',
renderer='templates/reset-password.pt')
def view_reset_password(request): def view_reset_password(request):
if request.authenticated_userid: if request.authenticated_userid:
return HTTPFound(location=f"{request.route_url('home')}") return HTTPFound(location=f"{request.route_url('home')}")
...@@ -394,7 +412,8 @@ def view_reset_password(request): ...@@ -394,7 +412,8 @@ def view_reset_password(request):
resp['form'] = form.render() resp['form'] = form.render()
return resp return resp
remain = regenerate_security_code(user) remain = regenerate_security_code(user)
set_user_log("Reset password to {}".format(user.email), request, log, user.user_name) set_user_log("Reset password to {}".format(user.email), request, log,
user.user_name)
send_email_security_code( send_email_security_code(
request, user, remain, 'Reset password', 'reset-password-body', request, user, remain, 'Reset password', 'reset-password-body',
'reset-password-body.tpl') 'reset-password-body.tpl')
...@@ -404,6 +423,7 @@ def view_reset_password(request): ...@@ -404,6 +423,7 @@ def view_reset_password(request):
@view_config( @view_config(
route_name='reset-password-sent', renderer='templates/reset-password-sent.pt') route_name='reset-password-sent',
renderer='templates/reset-password-sent.pt')
def view_reset_password_sent(request): def view_reset_password_sent(request):
return dict(title=_('Reset password')) return dict(title=_('Reset password'))
opensipkd/jsonrpc_auth/__init__.py
import logging import logging
import venusian from pyramid.httpexceptions import HTTPForbidden
from pyramid.httpexceptions import HTTPFound from pyramid.httpexceptions import HTTPNotFound
from pyramid.renderers import null_renderer
from pyramid.security import NO_PERMISSION_REQUIRED from pyramid.security import NO_PERMISSION_REQUIRED
from pyramid_rpc.jsonrpc import jsonrpc_method as json_rpc_base, MethodPredicate, BatchedRequestPredicate, \ from pyramid_rpc.jsonrpc import (JsonRpcError, JsonRpcMethodNotFound, JsonRpcParamsInvalid,
EndpointPredicate, jsonrpc_renderer, DEFAULT_RENDERER, add_jsonrpc_endpoint, add_jsonrpc_method, JsonRpcError, \ JsonRpcInternalError, make_error_response, MethodPredicate, BatchedRequestPredicate,
exception_view, JsonRpcRequestInvalid, parse_request_GET, parse_request_POST jsonrpc_renderer, add_jsonrpc_method,
DEFAULT_RENDERER,
from opensipkd.base.tools.api import auth_from_rpc batched_request_view, Endpoint, EndpointPredicate)
from opensipkd.base.views.user_login import get_login_headers from pyramid_rpc.mapper import ViewMapperArgsInvalid, MapplyViewMapper
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
def setup_request(endpoint, request):
""" Parse a JSON-RPC request body.""" class JsonRpcRequestForbidden(JsonRpcError):
if request.method == 'GET': code = -32604
parse_request_GET(request) message = 'request forbidden'
elif request.method == 'POST':
parse_request_POST(request)
class JsonRpcInvalidLogin(JsonRpcError):
code = -32605
message = "Invalid User/Password"
#
# class EndpointPredicate(BaseEndpointPredicate):
# def __call__(self, info, request):
# if self.val:
# # find the endpoint info
# key = info['route'].name
# endpoint = request.registry.jsonrpc_endpoints[key]
#
# # potentially setup either rpc v1 or v2 from the parsed body
# setup_request(endpoint, request)
#
# # update request with endpoint information
# request.rpc_endpoint = endpoint
#
# # Always return True so that even if it isn't a valid RPC it
# # will fall through to the notfound_view which will still
# # return a valid JSON-RPC response.
# return True
# def setup_request(endpoint, request):
# """ Parse a JSON-RPC request body."""
# if request.method == 'GET':
# parse_request_GET(request)
# elif request.method == 'POST':
# parse_request_POST(request)
# else:
# log.debug('unsupported request method "%s"', request.method)
# raise JsonRpcRequestInvalid
#
# if hasattr(request, 'batched_rpc_requests'):
# log.debug('handling batched rpc request')
# # the checks below will look at the subrequests
# return
#
# if request.rpc_version != '2.0':
# log.debug('id:%s invalid rpc version %s',
# request.rpc_id, request.rpc_version)
# raise JsonRpcRequestInvalid
#
# if request.rpc_method is None:
# log.debug('id:%s invalid rpc method', request.rpc_id)
# raise JsonRpcRequestInvalid
# env = request.environ
# if 'HTTP_TOKEN' in env:
# try:
# user_device = token_auth(request)
# user = user_device.user
# headers = remember(request, user.id)
# request.headers["Cookie"] = dict(headers)["Set-Cookie"]
# request.headers["token"]=user_device.token
# log.debug(request.headers["Cookie"])
# except JsonRpcInvalidLoginError as e:
# raise JsonRpcInvalidLogin
#
# elif ('HTTP_USERID' in env and 'HTTP_SIGNATURE' in env and
# 'HTTP_KEY' in env):
# try:
# user = rpc_auth(request)
# headers = remember(request, user.id)
# request.headers["Cookie"] = dict(headers)["Set-Cookie"]
# log.debug(request.headers["Cookie"])
# except JsonRpcInvalidLoginError as e:
# raise JsonRpcInvalidLogin
# log.debug('handling id:%s method:%s',
# request.rpc_id, request.rpc_method)
def exception_view(exc, request):
rpc_id = getattr(request, 'rpc_id', None)
if isinstance(exc, JsonRpcError):
fault = exc
log.debug('json-rpc error rpc_id:%s "%s"',
rpc_id, exc.message)
elif isinstance(exc, HTTPNotFound):
fault = JsonRpcMethodNotFound()
log.debug('json-rpc method not found rpc_id:%s "%s"',
rpc_id, request.rpc_method)
elif isinstance(exc, HTTPForbidden):
fault = JsonRpcRequestForbidden()
log.debug('json-rpc method forbidden rpc_id:%s "%s"',
rpc_id, request.rpc_method)
elif isinstance(exc, ViewMapperArgsInvalid):
fault = JsonRpcParamsInvalid()
log.debug('json-rpc invalid method params')
else: else:
log.debug('unsupported request method "%s"', request.method) fault = JsonRpcInternalError()
raise JsonRpcRequestInvalid log.exception('json-rpc exception rpc_id:%s "%s"', rpc_id, exc)
if hasattr(request, 'batched_rpc_requests'): return make_error_response(request, fault, rpc_id)
log.debug('handling batched rpc request')
# the checks below will look at the subrequests
return def add_jsonrpc_endpoint(config, name, *args, **kw):
"""Add an endpoint for handling JSON-RPC.
if request.rpc_version != '2.0':
log.debug('id:%s invalid rpc version %s', ``name``
request.rpc_id, request.rpc_version)
raise JsonRpcRequestInvalid The name of the endpoint.
if request.rpc_method is None: ``default_mapper``
log.debug('id:%s invalid rpc method', request.rpc_id)
raise JsonRpcRequestInvalid A default view mapper that will be passed as the ``mapper``
argument to each of the endpoint's methods.
log.debug('handling id:%s method:%s',
request.rpc_id, request.rpc_method) ``default_renderer``
class MethodPredicate(object): A default renderer that will be passed as the ``renderer``
def __init__(self, val, config): argument to each of the endpoint's methods. This should be the
self.method = val string name of the renderer, registered via
:meth:`pyramid.config.Configurator.add_renderer`.
def text(self):
return 'jsonrpc method = %s' % self.method A JSON-RPC method also accepts all of the arguments supplied to
:meth:`pyramid.config.Configurator.add_route`.
phash = text
"""
def __call__(self, context, request): default_mapper = kw.pop('default_mapper', MapplyViewMapper)
user = auth_from_rpc(request) default_renderer = kw.pop('default_renderer', DEFAULT_RENDERER)
headers = get_login_headers(request, user)
response = HTTPFound(location=request.route_url('home'), headers=headers) endpoint = Endpoint(
# response = request.response name,
request.response.set_cookie('userid', value=str(user.id), max_age=31536000) # max_age = year default_mapper=default_mapper,
return getattr(request, 'rpc_method', None) == self.method default_renderer=default_renderer,
)
config.registry.jsonrpc_endpoints[name] = endpoint
kw['jsonrpc_endpoint'] = True
config.add_route(name, *args, **kw)
kw = {}
kw['jsonrpc_batched'] = True
kw['renderer'] = null_renderer
config.add_view(batched_request_view, route_name=name,
permission=NO_PERMISSION_REQUIRED, **kw)
config.add_view(exception_view, route_name=name, context=Exception,
permission=NO_PERMISSION_REQUIRED)
def includeme(config): def includeme(config):
""" Set up standard configurator registrations. Use via: """ Set up standard configurator registrations. Use via:
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!