From 22d09f122df0baa7f9d033e687b0422ea12b0e07 Mon Sep 17 00:00:00 2001 From: Rezende & Pedro & Carlos & Raphael Date: Tue, 14 Jul 2015 15:17:30 -0300 Subject: [PATCH] LDAP integration: change name/email/password/keys -- Guilherme Iecker --- portal/actions.py | 9 ++- portal/homeview.py | 9 +-- portal/lsapiclient.py | 4 +- portal/templates/fibre/fibre_institution.html | 41 +++++++------ .../fibre/fibre_registration_view.html | 57 +++++++++++-------- portal/templates/fibre/fibre_termsview.html | 57 ++++++++++++------- 6 files changed, 104 insertions(+), 73 deletions(-) diff --git a/portal/actions.py b/portal/actions.py index c7ed62bc..eb46bee9 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -752,7 +752,7 @@ def manifold_add_reference_user_accounts(wsgi_request, request): } manifold_add_account(wsgi_request, manifold_account_params) -def sfa_create_user(wsgi_request, request, namespace = None, as_admin = False): +def sfa_create_user(wsgi_request, request, namespace = None, as_admin = True): """ Arguments: wsgi_request (~ WSGIRequest) : @@ -783,6 +783,13 @@ def sfa_create_user(wsgi_request, request, namespace = None, as_admin = False): #query = Query.create('user').set(sfa_user_params).select('user_hrn') #results = execute_query(wsgi_request, query) + ###### Guilherme 08-07-2015 + ##subject = 'Teste das chaves publicas' + ##message = 'Um novo usuario SFA esta sendo criado\n' + ##message += "request['public_key']: " + request['public_key'] + '\n' + ##message += "sfa_user_params['keys']: " + sfa_user_params['keys'] + '\n' + ##send_mail(subject, message, 'support@fibre.org.br', [request['email']], fail_silently=False) + if namespace is not None: query = Query.create('%s:user' % namespace).set(sfa_user_params).select('user_hrn') else: diff --git a/portal/homeview.py b/portal/homeview.py index cf3fcbab..6c5ee9a7 100644 --- a/portal/homeview.py +++ b/portal/homeview.py @@ -64,8 +64,8 @@ class HomeView (FreeAccessView, ThemeView): ################################################# ## first you must open a connection to the server try: - # Connect to NOC - l = ldap.initialize("ldap://10.128.0.50:389") + # Connect to UFRJ + l = ldap.initialize("ldap://200.130.15.186:389") # Bind/authenticate with a root user to search all objects l.simple_bind_s("cn=Manager,dc=br,dc=fibre","fibre2013") @@ -316,8 +316,9 @@ class HomeView (FreeAccessView, ThemeView): else: # log user activity #activity.user.login(self.request, "error") - env['state'] = "Your username and/or password were incorrect." - + + env['state'] = "Your username and/or password were incorrect." + return render_to_response(self.template, env, context_instance=RequestContext(request)) def get (self, request, state=None): diff --git a/portal/lsapiclient.py b/portal/lsapiclient.py index 23584abf..c99ecae7 100644 --- a/portal/lsapiclient.py +++ b/portal/lsapiclient.py @@ -16,7 +16,9 @@ class LaboraSchedulerClient: 'get_user_id_by_username', 'add_user_public_key', 'delete_user_public_key' ] def __init__ ( self, organization ): - self.url, self.key = self.getOrganizationConfigs( organization ) + #self.url, self.key = self.getOrganizationConfigs( organization ) + self.url = "https://portal.ufrj.fibre.org.br:3002/LS-Sched/" + self.key = "9763dd03f2da8138fb22a63d78e5e9792b59a637" def __getattr__(self, name): diff --git a/portal/templates/fibre/fibre_institution.html b/portal/templates/fibre/fibre_institution.html index 1d6cf97e..b58f3c41 100644 --- a/portal/templates/fibre/fibre_institution.html +++ b/portal/templates/fibre/fibre_institution.html @@ -6,32 +6,29 @@ {% block content %}
-
-
-
- Management  >  Institution: -
-
-
+
+
+
+ Management  >  Institution: +
+
+
+
-
-
- -
-
+
+
+ +
+
+
- -
+
Loading Slices
diff --git a/portal/templates/fibre/fibre_termsview.html b/portal/templates/fibre/fibre_termsview.html index a82e2b13..7e866aa1 100644 --- a/portal/templates/fibre/fibre_termsview.html +++ b/portal/templates/fibre/fibre_termsview.html @@ -15,29 +15,42 @@ Fibre: Future Internet testbeds experimentation between Brazil and Europe

-

Context

-

- The main goal of the FIBRE project is the design, implementation and validation of a shared Future Internet research facility, supporting the joint experimentation of European and Brazilian researchers. In order to achieve this goal the project will carry out four main activities: +

+ By registering as a FIBRE-BR testbed user, experimenters shall be deemed to accept these conditions of use:

-

- The development and operation of a new experimental facility in Brazil, including the setup of equipment to support experimentation with various technologies (fixed layer 2 and layer 3, wireless, optical) as well as the design and implementation of a control framework to automate the use and operation of the testbed. -

-

- The development and operation of a Future Internet facility in Europe based on enhancements and the federation of two existing infrastructures: OFELIA and OneLab. Two OFELIA islands (i2CAT and University of Bristol (UNIVBRIS)) and the UTH's NITOS testbed will be enhanced by i) adding more physical resources (servers, OpenFlow-enabled switches and access points) to be able to cope with a bigger number ofusers and different use cases, ii) improving its respective control frameworks (based on the OFELIA control framework and OMF) and iii) adding more manpower to operate the facilities. -

-

- The federation of the Brazilian and European experimental facilities, both at the physical connectivity and control framework level, to support the provisioning of slices using resources from both testbeds. -

-

PROCEDURE OVERVIEW

-

If your institution is willing to join the FIBRE Consortium, you are kindly requested to follow the steps below:

-

1. Download the MoU model to understand the framework of collaboration between your institution and FIBRE project. The content of the MoU shall be discussed in case-by-case basis between the two parties.  

-

2. Contact the Project office at info@fibre.org.br to schedule a call to clarify all your questions concerning the duties, responsibilities and advantages of joining the FIBRE project.

-

3. If your institution understand and agree on the commitment stated in the MoU, please submit the application by editing the MoU template and sending it to - info@fibre.org.br

-

4. Application Approval: the FIBRE General Assembly will decide based on the application and information gathered during the call. The approval process will normally take around one month.

5. By mutual agreement of both parties, MoU will be prepared and signed.

-

6. Testbed usage / island installation: FIBRE will provide instructions and support to help your institution to carry out the activities described in the MoU.

-


-

Watch the webconference meeting about the MoU details
(Held on 5/July 2013, in Portuguese)

+
    +
  1. + Users shall not use the testbed resources for any unlawful purpose and not (attempt to) breach or circumvent any administrative or security controls. +

    2. +
  2. + Users shall respect intellectual property and confidentiality agreements. +

    3. +
  3. + Users shall protect their access credentials (e.g. private keys or passwords). +

    4. +
  4. + User access credentials will expire 1 year after your registration. Users can renew your registration at any time after the expiry date. +

    5. +
  5. + Users shall immediately report any known or suspected security breach or misuse of the testbed or access credentials to FIBRE-BR´s Network Operation Centre (a.k.a. NOC). +

    6. +
  6. + Users must notify the NOC of any changes to their Registration Information. +

    7. +
  7. + Use of the testbed resources is at their own risk. The resources offered by each island are provided “as is”, with no guarantee that the testbed will be available at any time or that it will suit any purpose. +

    8. +
  8. + Logged information, including information provided by users for registration purposes, is used for administrative, operational, accounting, monitoring and security purposes only. This information may be disclosed, via secured mechanisms, only for the same purposes and only as far as necessary to other organizations cooperating with the FIBRE-BR testbed. Although efforts are made to maintain confidentiality, no guarantees are given. +

    9. +
  9. + The island administrators and resource providers are entitled to regulate, suspend or terminate users’ access, within their domain of authority, and users shall immediately comply with their instructions. +

    10. +
  10. + Users are liable for the consequences of their violation of any of these conditions of use. +

    11. +
+


-- 2.43.0