Author: scottbw
Date: Wed Mar 12 08:40:13 2014
New Revision: 1576635
URL: http://svn.apache.org/r1576635
Log:
Removed the ApiKeys REST API from Wookie 2.x as this is no longer consistent
with the new security model which relies on secrets not being transmitted over
HTTP; if admins want to manage keys on the server remotely they need to do so
via SSH, VPN etc.
Removed:
wookie/trunk/wookie-connector/java/src/main/java/org/apache/wookie/connector/framework/ApiKey.java
wookie/trunk/wookie-server/src/main/java/org/apache/wookie/controller/ApiKeyController.java
wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/ApiKeyControllerTest.java
Modified:
wookie/trunk/wookie-connector/java/src/main/java/org/apache/wookie/connector/framework/AbstractWookieConnectorService.java
wookie/trunk/wookie-connector/java/src/test/java/org/apache/wookie/tests/connector/framework/impl/WookieConnectorService.java
wookie/trunk/wookie-server/src/main/webapp/WEB-INF/web.xml
Modified:
wookie/trunk/wookie-connector/java/src/main/java/org/apache/wookie/connector/framework/AbstractWookieConnectorService.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-connector/java/src/main/java/org/apache/wookie/connector/framework/AbstractWookieConnectorService.java?rev=1576635&r1=1576634&r2=1576635&view=diff
==============================================================================
---
wookie/trunk/wookie-connector/java/src/main/java/org/apache/wookie/connector/framework/AbstractWookieConnectorService.java
(original)
+++
wookie/trunk/wookie-connector/java/src/main/java/org/apache/wookie/connector/framework/AbstractWookieConnectorService.java
Wed Mar 12 08:40:13 2014
@@ -538,87 +538,6 @@ public abstract class AbstractWookieConn
}
}
-
- /**
- * Gets a list of all the api keys registered in wookie
- * @param adminUsername
- * @param adminPassword
- * @return
- * @throws WookieConnectorException
- * @throws IOException
- */
- public List<ApiKey> getAPIKeys() throws WookieConnectorException,
IOException {
-
- SignedApiRequest request =
SignedApiRequest.GET(conn.getURL()+"/keys", conn.getApiKey(), conn.getSecret());
- request.execute();
-
- ArrayList<ApiKey> keys = new ArrayList<ApiKey>();
- try {
- Document doc = parseInputStreamAsDocument (
request.getResponseBodyAsStream() );
- Element rootElement = doc.getDocumentElement();
- NodeList keyNodes =
rootElement.getElementsByTagName("key");
- for ( int i = 0; i < keyNodes.getLength(); i++ ) {
- Element keyElement = (Element) keyNodes.item(i);
- ApiKey key = new ApiKey (
- keyElement.getTextContent(),
- null);
- keys.add(key);
- }
- }
- catch ( MalformedURLException e ) {
- throw new WookieConnectorException ( "Bad url: ", e);
- }
- catch (ParserConfigurationException e) {
- e.printStackTrace();
- throw new WookieConnectorException ( "Problem parsing
data returned by Wookie: ", e);
- }
- catch (SAXException e) {
- e.printStackTrace();
- throw new WookieConnectorException ( "Problem parsing
data returned by Wookie: ", e);
- }
- return keys;
- }
-
-
- /**
- * Creates a new api key
- * @param newKey
- * @param adminUsername
- * @param adminPassword
- * @throws WookieConnectorException
- */
- public void createApiKey ( ApiKey newKey) throws
WookieConnectorException {
-
- SignedApiRequest request =
SignedApiRequest.POST(conn.getURL()+"/keys", conn.getApiKey(),
conn.getSecret());
- request.addParameter("apikey", newKey.getKey());
- request.addParameter("email", newKey.getSecret());
- try {
- request.execute();
- } catch (IOException e) {
- throw new WookieConnectorException("Problem adding an
apikey.", e);
- }
- if (request.getStatusCode() != 201){
- throw new WookieConnectorException("Problem adding an
apikey. ", new IOException("Error:"+request.getStatusCode()));
- }
- }
-
-
- /**
- * Deletes a specified key
- * @param key
- * @throws IOException
- * @throws WookieConnectorException
- */
- public void removeApiKey ( ApiKey key) throws IOException,
WookieConnectorException {
- SignedApiRequest request =
SignedApiRequest.DELETE(conn.getURL()+"/keys/"+key.getKey(), conn.getApiKey(),
conn.getSecret());
- request.execute();
- if ( request.getStatusCode() != 200 ) {
- throw new IOException ("Problem DELETEing from
/keys");
- }
- }
-
-
-
/**
* Returns a full list of policies
* @param adminUsername
Modified:
wookie/trunk/wookie-connector/java/src/test/java/org/apache/wookie/tests/connector/framework/impl/WookieConnectorService.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-connector/java/src/test/java/org/apache/wookie/tests/connector/framework/impl/WookieConnectorService.java?rev=1576635&r1=1576634&r2=1576635&view=diff
==============================================================================
---
wookie/trunk/wookie-connector/java/src/test/java/org/apache/wookie/tests/connector/framework/impl/WookieConnectorService.java
(original)
+++
wookie/trunk/wookie-connector/java/src/test/java/org/apache/wookie/tests/connector/framework/impl/WookieConnectorService.java
Wed Mar 12 08:40:13 2014
@@ -21,9 +21,7 @@ import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
-import java.util.ListIterator;
-import org.apache.wookie.connector.framework.ApiKey;
import org.apache.wookie.connector.framework.Policy;
import org.apache.wookie.connector.framework.User;
import org.apache.wookie.connector.framework.Widget;
@@ -237,32 +235,6 @@ public class WookieConnectorService {
@Test
- public void apikeys() throws IOException, WookieConnectorException {
-
- List<ApiKey> apikeys = service.getAPIKeys();
- int apikeysLength = apikeys.size();
- assertTrue ( "Unable to get api keys", ( apikeysLength > 0));
- ApiKey newKey = new ApiKey ("tester", "[email protected]" );
- service.createApiKey(newKey);
-
- apikeys = service.getAPIKeys();
-
- boolean foundKey = false;
- ListIterator<ApiKey> li = apikeys.listIterator();
- while (li.hasNext()) {
- ApiKey akey = li.next();
- if ( akey.getKey().equals("tester")) {
- foundKey = true;
- }
- }
- assertTrue ( "New key not created", foundKey );
-
- service.removeApiKey(newKey);
- assertEquals ( service.getAPIKeys().size(), apikeysLength);
- }
-
-
- @Test
public void policyTest ( ) throws IOException, WookieConnectorException {
List<Policy> policies = service.getPolicies(null);
Modified: wookie/trunk/wookie-server/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/main/webapp/WEB-INF/web.xml?rev=1576635&r1=1576634&r2=1576635&view=diff
==============================================================================
--- wookie/trunk/wookie-server/src/main/webapp/WEB-INF/web.xml (original)
+++ wookie/trunk/wookie-server/src/main/webapp/WEB-INF/web.xml Wed Mar 12
08:40:13 2014
@@ -140,20 +140,6 @@
<servlet-name>PropertiesServlet</servlet-name>
<url-pattern>/properties</url-pattern>
</servlet-mapping>
-
- <servlet>
- <description></description>
- <display-name>ApiKeys</display-name>
- <servlet-name>ApiKeyController</servlet-name>
- <servlet-class>
- org.apache.wookie.controller.ApiKeyController
- </servlet-class>
- <load-on-startup>2</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>ApiKeyController</servlet-name>
- <url-pattern>/keys/*</url-pattern>
- </servlet-mapping>
<servlet>
<description></description>
@@ -338,10 +324,6 @@
<filter-name>AuthorizationFilter</filter-name>
<servlet-name>PoliciesServlet</servlet-name>
</filter-mapping>
- <filter-mapping>
- <filter-name>AuthorizationFilter</filter-name>
- <servlet-name>ApiKeyController</servlet-name>
- </filter-mapping>
<filter-mapping>
<filter-name>AuthorizationFilter</filter-name>
<servlet-name>UpdatesServlet</servlet-name>
