MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
1,226 Commits
42 Branches
370 Tags
181 MiB
Commit Graph

111 Commits (aa66d5deceabdb5b28a2fe1fb77968b10017a3bb)

Author SHA1 Message Date
iglocska 7a09076bc8 Set the default value of the flag disabling rest alert messages to false 2013-08-06 10:09:19 +02:00
iglocska 5011b50c65 Notification on rest add of published events. Fixes #138 2013-08-06 09:43:00 +02:00
iglocska cc417fdb05 Change to the routing the login to remove the admin tag 2013-07-31 16:56:44 +02:00
iglocska b5a829e011 Re-enabled route from /admin/users/login to /users/login 
- when an admin user got logged out the system threw an error instead of
returning him/her to the login screen
 2013-07-11 17:09:58 +02:00
iglocska 7e6f73a776 Removal of the blacklist 
- Since regexp can be used to blacklist things, there's no need to have
two separate features that accomplish the same thing

- Add a regexp named /1.1.1.1/ with nothing as replacement and it will
behave the same as adding a blacklist for 1.1.1.1 in the old system.
 2013-07-05 14:34:32 +02:00
iglocska c58eb89013 Changes to the UI 
- login screen looks a bit fancier and is more customisable
- admins can add a Logo next to the login fields, there's a MISP logo
ontop with a line of text above and below it, editable via bootstrap.php
- Footer re-added, has the PGP key download and the center footer text
from MISP 1.1
- A logo on the right side of the footer, optionally added by
bootstrap.php

- Header, Footer, menu are now fixed and not affected by scrolling the
screen
 2013-07-02 15:41:11 +02:00
iglocska 32c0b4e017 Change to the login screen 
- Places an optional logo to the left
- MISP logo above the login fields, with an optional pre and post text

- define them in the bootstrap as indicated in bootsrap.default.php
 2013-07-01 17:07:40 +02:00
iglocska abde2a47af Several fixes 
- Fixed the search pagination beyond the first page

- Hard coded routing of the menues in the global actions area
 2013-06-28 14:28:58 +02:00
Christophe Vandeplas ac5c59e9af minor changes 2013-06-24 15:12:30 +02:00
iglocska 96d0ea10cb Wrong file included in previous commit 2013-06-20 16:28:15 +02:00
iglocska 55f47d3166 ShadowAttribute notifications, and some minor fixes 
- New field for events, locking an event from sending out a contact
e-mail when a proposal is made to it
- Default setting for the new field is 0, if a shadow attribute is
added an e-mail is sent to all subscribing members of the orgc and the
new field is set to 1
- Accepting a change resets the field to 0
 2013-06-20 16:21:55 +02:00
iglocska 8df300221e login url won't include /admin/ anymore 
- routing issue fixed
 2013-06-19 10:29:58 +02:00
iglocska 6a30abfdd1 Change to the routes 
- disabling the routes to indeces with pagination throws an error when
switching to another page
 2013-06-11 14:05:40 +02:00
iglocska 78b3a1c0ed Routing and some UI changes to the users admin_index 2013-06-11 10:34:01 +02:00
Christophe Vandeplas de8793fbfc Performance - caching of CakeRouting and url generation 2013-06-10 18:01:04 +02:00
Christophe Vandeplas 69251490ef Merge branch 'feature/gui' of https://github.com/MISP/MISP into 
feature/gui

Conflicts:
	app/View/Logs/admin_index.ctp
	app/View/Logs/admin_search.ctp
	app/View/Users/memberslist.ctp
 2013-05-31 17:50:00 +02:00
Christophe Vandeplas e3ed847ba0 fixing some REST API and XML issues 2013-05-28 11:15:21 +02:00
Christophe Vandeplas 0614db919e fixes information leakage vulnerability on REST XML outputs 2013-05-22 10:52:03 +02:00
Andras Iklody 2288a18603 Merge branch 'master' into develop 
Conflicts:
	app/Config/bootstrap.default.php
 2013-04-17 08:47:18 +02:00
Christophe Vandeplas 2ff9af3164 fix merge issue 2013-04-16 17:04:48 +02:00
Christophe Vandeplas 60378a076b Merge branch 'master' of https://github.com/MISP/MISP.git 2013-04-16 16:59:47 +02:00
Christophe Vandeplas 8029d7fa29 removes multiple correlation engines Fixes #83 but after testing issue 
#95 comes to light
 2013-04-16 16:59:12 +02:00
Andras Iklody 4bd20c5355 Merge branch 'master' of https://github.com/MISP/MISP 
Conflicts:
	app/Config/bootstrap.default.php
 2013-04-16 16:18:57 +02:00
Andras Iklody 9a1bb61ed5 Small fixes 
- Comments about isAdmin vs isSiteAdmin

- Extra config line added to bootstrap.default.php for the built in e-mail
  system
 2013-04-16 15:55:33 +02:00
Andras Iklody 3d2d752d3f Small fix 2013-04-16 15:54:24 +02:00
Andras Iklody 6fc5b63fb9 Small changes 
- added an optional field to the bootstrap default (used by the e-mail
  notification system)

- Clarification about the isAdmin and isSiteAdmin (comment)
 2013-04-16 15:52:19 +02:00
Christophe Vandeplas 8d5782125d removed unused CyDefSIG.showowner field. Closes issue #93 2013-04-16 15:29:34 +02:00
iglocska 54c02dc218 Update to the default config files 
- Some minor changes to the default config files
 2013-03-18 13:38:52 +01:00
Noud de Brouwer ce44cdb529 coding standards 
this is to the new php53-pear-CakePHP_CodeSniffer-0.1.11.
 2013-02-15 14:20:03 +00:00
Andras Iklody e88a3a9cf7 Updates to security 
- perm_auth new toggle, can disable auth key usage for a role

- prevents sync / rest with a perm_auth == false key

- some changes to sync to provide better feedback on why it failed

- rewording of distribution options
 2013-02-06 17:45:43 +01:00
Noud de Brouwer ce430a2005 coding standards 
Coding Standards.
 2013-01-28 08:43:44 +00:00
Noud de Brouwer a6371f5ad8 coding standards 
Coding Standards.
 2013-01-28 08:32:01 +00:00
Noud de Brouwer e4a812f0ff DB 
in conversion create Blacklist table as well.
 2013-01-23 14:44:41 +00:00
Noud de Brouwer 8bf8ef17ca RBAC 
so role is editable.
(i will not commit/push during after hours ;) )
 2013-01-22 18:37:30 +00:00
Noud de Brouwer 94bf4e8025 sql blacklist 
somehow all _working_ code for blacklist got committed and pushed
but not the sql db change, find this here-in.
 2013-01-22 09:45:02 +00:00
Noud de Brouwer a9a1bc91a1 AdminCrud and coding standard 
more AdminCrud and coding standard clean up.
 2013-01-04 15:48:46 +00:00
Noud de Brouwer 1e518f8bc0 Import Regexp 
Renamed Import Whitelist to Import Regexp.
 2012-12-20 18:47:38 +00:00
Noud de Brouwer eb39796472 DB 
clean up conversion.
 2012-12-19 12:12:33 +00:00
Noud de Brouwer 5ecbfd1bbf coding standards 
Coding Standards.
 2012-12-19 02:57:30 +00:00
Noud de Brouwer fea8450388 generateAllFor<FieldName> 
missed adding app/Lib/CamelCase.php and app/Config/routes.php.
 2012-12-18 08:03:01 +00:00
Andras Iklody 1ceadab700 Added features from branch analysis_levels 
-Analaysis levels setable for events as per milestone item 94
-Password change forced as per milestone item 109
-Added feedback on entered search terms for search attributes
-fixed the authentication issue
-some minor fixes
 2012-12-17 15:51:30 +01:00
noud 2903493205 Merge branch 'master' into develop 
Conflicts:
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
 2012-12-13 16:03:35 +01:00
noud 276cb5df10 RESTfull sync 
this is in responce to the email
From: <User1088@QET.BE>
To: <ndebrouwer@hotmail.com>, <andrzej.dereszowski@ncirc.nato.int>
Subject: Re: sync/REST
Date: Fri, 7 Dec 2012 13:30:10 +0000
in this there is a complaint about the RESTfull sync workings.
the email hints about 2 possible options:
i) RESTfull add event without attributes (conform the web interface)
ii) RESTfull add event with attributes (more conform the code)

both are implemented and can be choisen in bootstrap.php by
Configure::write('CyDefSIG.rest', 'ii') or 'i'.
 2012-12-13 15:52:00 +01:00
noud 094719fa01 Merge branch 'master' into develop 
Conflicts:
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Controller/ServersController.php
	app/Model/Event.php
 2012-12-12 18:01:39 +01:00
noud dad39083cf CakePHP 
CakePHP update from 2.2.3 to 2.2.4
 2012-12-12 16:51:02 +01:00
noud 26c8ad57ee Role 
renamed everything group to role (i.s.o. renaming just the visable).
 2012-12-12 16:15:01 +01:00
noud 8119d26d35 RBAC and Roles 
did add Acl Admin and Audit.
 2012-12-11 17:40:57 +01:00
noud e4dafd3882 RESTfull sync 
RESTfull attribute add, edit and view, to be usefull in sync.
 2012-12-10 11:32:40 +01:00
noud 75dfba2ae1 sync 
have sync option in role.
and only display the Sync Actions when sync option or admin.
(still has to be disabled if role is below manage org events.
 2012-12-07 15:00:40 +01:00
noud 535a858d13 db 
add the regex table to db conversion.
 2012-12-05 17:51:31 +01:00