Attachment #94611 for bug #220805




<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <title>Package-level Javadoc</title>
</head>
<body>
Equinox security UI-related services  
<h2>
Package Specification</h2>
<p>This package provides an infrastructure and helper utilities for the Equinox security UI services.
</p>
</body>
</html>




/*******************************************************************************
 * Copyright (c) 2007 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.equinox.internal.provisional.security.ui.services;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.ui.IWorkbenchWindow;

/**
 * The AuthorizationManager is the facility by which the end user
 * is informed of the current state of the system with respect to 
 * bundle authorization based security. 
 */
public abstract class AuthorizationManager {

	public AuthorizationManager() {
		//no content
	}

	/**
	 * Query whether the authorization system is enabled for the system.
	 * 
	 * @return <code>true</code> if and only if authorization is enabled 
	 */
	abstract public boolean isEnabled();

	/**
	 * Returns true when the system is in need of attention from the end
	 * user. This means that some unauthorized content has been encountered, and the 
	 * user has not yet inspected the situation.
	 * 
	 * @return <code>true</code> if user attention is required
	 */
	abstract public boolean needsAttention();

	/**
	 * Return an Eclipse IStatus object representing the current state of the 
	 * authorization system.
	 *
	 * @return IStatus code representing the system status
	 */
	abstract public IStatus getStatus();

	/**
	 * Open the authorization manager user interface so that the end
	 * user can view and edit the system's authorization state.
	 * 
	 * @param workbenchWindow the workbench window
	 */
	abstract public void displayManager(IWorkbenchWindow workbenchWindow);

}

Lines 13-18 Link Here

(-)src/org/eclipse/equinox/internal/security/ui/preferences/CertificatesPage.java (+2 lines)
13	import java.security.cert.Certificate;	13	import java.security.cert.Certificate;
14	import java.security.cert.X509Certificate;	14	import java.security.cert.X509Certificate;
15	import java.util.*;	15	import java.util.*;
		16	import org.eclipse.equinox.internal.provisional.security.ui.X500PrincipalHelper;
		17	import org.eclipse.equinox.internal.provisional.security.ui.X509CertificateViewDialog;
16	import org.eclipse.equinox.internal.security.ui.*;	18	import org.eclipse.equinox.internal.security.ui.*;
17	import org.eclipse.equinox.internal.security.ui.wizard.CertificateImportWizard;	19	import org.eclipse.equinox.internal.security.ui.wizard.CertificateImportWizard;
18	import org.eclipse.jface.preference.PreferencePage;	20	import org.eclipse.jface.preference.PreferencePage;

Lines 12-18 Link Here

(-)src/org/eclipse/equinox/internal/security/ui/DefaultAuthorizationManager.java (-1 / +1 lines)
12		12
13	import org.eclipse.core.runtime.IStatus;	13	import org.eclipse.core.runtime.IStatus;
14	import org.eclipse.core.runtime.Status;	14	import org.eclipse.core.runtime.Status;
15	import org.eclipse.equinox.internal.provisional.security.ui.services.AuthorizationManager;	15	import org.eclipse.equinox.internal.provisional.security.ui.AuthorizationManager;
16	import org.eclipse.osgi.internal.provisional.service.security.AuthorizationStatus;	16	import org.eclipse.osgi.internal.provisional.service.security.AuthorizationStatus;
17	import org.eclipse.ui.IWorkbenchWindow;	17	import org.eclipse.ui.IWorkbenchWindow;
18		18

Lines 15-21 Link Here

(-)src/org/eclipse/equinox/internal/security/ui/Activator.java (-1 / +1 lines)
15	import java.util.Hashtable;	15	import java.util.Hashtable;
16	import org.eclipse.core.runtime.IStatus;	16	import org.eclipse.core.runtime.IStatus;
17	import org.eclipse.core.runtime.Status;	17	import org.eclipse.core.runtime.Status;
18	import org.eclipse.equinox.internal.provisional.security.ui.services.AuthorizationManager;	18	import org.eclipse.equinox.internal.provisional.security.ui.AuthorizationManager;
19	import org.eclipse.jface.resource.ImageDescriptor;	19	import org.eclipse.jface.resource.ImageDescriptor;
20	import org.eclipse.osgi.internal.provisional.service.security.AuthorizationEngine;	20	import org.eclipse.osgi.internal.provisional.service.security.AuthorizationEngine;
21	import org.eclipse.osgi.service.resolver.PlatformAdmin;	21	import org.eclipse.osgi.service.resolver.PlatformAdmin;




/*******************************************************************************
 * Copyright (c) 2008,  Jay Rosenthal
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     Jay Rosenthal - initial API and implementation
 *******************************************************************************/

package org.eclipse.equinox.internal.security.ui;

import java.security.cert.X509Certificate;
import java.text.DateFormat;
import org.eclipse.equinox.internal.security.ui.wizard.CertificateViewer;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;

public class X509CertificateViewDialog extends TitleAreaDialog {
	private final static String titleImageName = "/titleAreaCert.gif"; //$NON-NLS-1$
	private X509Certificate theCert;
	private static final DateFormat _df = DateFormat.getDateInstance(DateFormat.LONG);
	private X500PrincipalHelper nameHelper = new X500PrincipalHelper();

	// We use the "bannerFont" for our bold font
	private static Font boldFont = JFaceResources.getBannerFont();
	private Image titleImage;

	public X509CertificateViewDialog(Shell parentShell, X509Certificate cert) {
		super(parentShell);
		this.theCert = cert;
	}

	protected Control createContents(Composite parent) {
		return super.createContents(parent);
	}

	protected Control createDialogArea(Composite parent) {
		nameHelper.setPrincipal(theCert.getSubjectX500Principal());

		setTitle((nameHelper.getCN() != null ? nameHelper.getCN() : nameHelper.getOU()));

		titleImage = Activator.getImageDescriptor(titleImageName).createImage();

		if (titleImage != null)
			setTitleImage(titleImage);

		Composite composite = (Composite) super.createDialogArea(parent);

		TabFolder tabFolder = new TabFolder(composite, SWT.BORDER);
		GridData bdata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
		tabFolder.setLayoutData(bdata);

		createBasicTab(tabFolder);

		createAdvancedTab(tabFolder);

		return composite;
	}

	private void createBasicTab(TabFolder tabFolder) {
		String displayName = null;
		int labelIndent = 10;
		int dataIdent = 10;

		TabItem basicTab = new TabItem(tabFolder, SWT.NULL);
		basicTab.setText(SecurityUIMsg.CERTVIEW_LABEL_BASIC);
		Composite basicTabComposite = new Composite(tabFolder, SWT.NONE);

		GridLayout tabLayout = new GridLayout();
		tabLayout.numColumns = 2;
		basicTabComposite.setLayout(tabLayout);

		Label issueToLabel = new Label(basicTabComposite, SWT.NONE);
		issueToLabel.setText(SecurityUIMsg.CERTPROP_X509_ISSUED_TO);
		issueToLabel.setFont(boldFont);
		configureLayout(issueToLabel, 2, 0, 0, 0);

		// Display the RDNs of the Subject
		nameHelper.setPrincipal(theCert.getSubjectX500Principal());

		Label CNLabel = new Label(basicTabComposite, SWT.NONE);
		CNLabel.setText(SecurityUIMsg.X500_LABEL_CN);
		configureLayout(CNLabel, 0, 0, labelIndent, 0);

		Label subjectCN = new Label(basicTabComposite, SWT.NONE);
		displayName = nameHelper.getCN();
		subjectCN.setText((displayName != null ? displayName : SecurityUIMsg.CERTVAL_UNDEFINED));
		configureLayout(subjectCN, 0, 0, dataIdent, 0);

		Label OLabel = new Label(basicTabComposite, SWT.NONE);
		OLabel.setText(SecurityUIMsg.X500_LABEL_O);
		configureLayout(OLabel, 0, 0, labelIndent, 0);

		Label subjectO = new Label(basicTabComposite, SWT.NONE);
		displayName = nameHelper.getO();
		subjectO.setText((displayName != null ? displayName : SecurityUIMsg.CERTVAL_UNDEFINED));
		configureLayout(subjectO, 0, 0, dataIdent, 0);

		Label OULabel = new Label(basicTabComposite, SWT.NONE);
		OULabel.setText(SecurityUIMsg.X500_LABEL_OU);
		configureLayout(OULabel, 0, 0, labelIndent, 0);

		Label subjectOU = new Label(basicTabComposite, SWT.NONE);
		displayName = nameHelper.getOU();
		subjectOU.setText((displayName != null ? displayName : SecurityUIMsg.CERTVAL_UNDEFINED));
		configureLayout(subjectOU, 0, 0, dataIdent, 0);

		Label issueByLabel = new Label(basicTabComposite, SWT.NONE);
		issueByLabel.setText(SecurityUIMsg.CERTPROP_X509_ISSUED_BY);
		configureLayout(issueByLabel, 2, 0, 0, 0);
		issueByLabel.setFont(boldFont);

		// Display the RDNs of the Issuer
		nameHelper.setPrincipal(theCert.getIssuerX500Principal());

		Label CNLabel2 = new Label(basicTabComposite, SWT.NONE);
		CNLabel2.setText(SecurityUIMsg.X500_LABEL_CN);
		configureLayout(CNLabel2, 0, 0, labelIndent, 0);

		Label issuerCN = new Label(basicTabComposite, SWT.NONE);
		displayName = nameHelper.getCN();
		issuerCN.setText((displayName != null ? displayName : SecurityUIMsg.CERTVAL_UNDEFINED));
		configureLayout(issuerCN, 0, 0, dataIdent, 0);

		Label OLabel2 = new Label(basicTabComposite, SWT.NONE);
		OLabel2.setText(SecurityUIMsg.X500_LABEL_O);
		configureLayout(OLabel2, 0, 0, labelIndent, 0);

		Label issuerO = new Label(basicTabComposite, SWT.NONE);
		displayName = nameHelper.getO();
		issuerO.setText((displayName != null ? displayName : SecurityUIMsg.CERTVAL_UNDEFINED));
		configureLayout(issuerO, 0, 0, dataIdent, 0);

		Label OULabel2 = new Label(basicTabComposite, SWT.NONE);
		OULabel2.setText(SecurityUIMsg.X500_LABEL_OU);
		configureLayout(OULabel2, 0, 0, labelIndent, 0);

		Label issuerOU = new Label(basicTabComposite, SWT.NONE);
		displayName = nameHelper.getOU();
		issuerOU.setText((displayName != null ? displayName : SecurityUIMsg.CERTVAL_UNDEFINED));
		configureLayout(issuerOU, 0, 0, dataIdent, 0);

		Label datesLabel = new Label(basicTabComposite, SWT.NONE);
		datesLabel.setText(SecurityUIMsg.CERTVIEW_LABEL_VALIDITY_DATES);
		configureLayout(datesLabel, 2, 0, 0, 0);
		datesLabel.setFont(boldFont);

		Label validFrom = new Label(basicTabComposite, SWT.NONE);
		validFrom.setText(SecurityUIMsg.CERTPROP_X509_VALID_FROM);
		configureLayout(validFrom, 0, 0, labelIndent, 0);

		Label fromDate = new Label(basicTabComposite, SWT.NONE);
		fromDate.setText(_df.format(theCert.getNotBefore()));
		configureLayout(fromDate, 0, 0, dataIdent, 0);

		Label validTo = new Label(basicTabComposite, SWT.NONE);
		validTo.setText(SecurityUIMsg.CERTPROP_X509_VALID_TO);
		configureLayout(validTo, 0, 0, labelIndent, 0);

		Label toDate = new Label(basicTabComposite, SWT.NONE);
		toDate.setText(_df.format(theCert.getNotAfter()));
		configureLayout(toDate, 0, 0, dataIdent, 0);

		basicTab.setControl(basicTabComposite);
	}

	protected static void configureLayout(Control c, int horizontalSpan, int verticalSpan, int horizontalIndent, int vertIndent) {
		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_CENTER);

		gd.horizontalSpan = horizontalSpan;
		gd.verticalSpan = verticalSpan;
		gd.horizontalIndent = horizontalIndent;
		gd.verticalIndent = vertIndent;

		c.setLayoutData(gd);

	}

	private void createAdvancedTab(final TabFolder tabFolder) {
		TabItem advancedTab = new TabItem(tabFolder, SWT.NULL);
		advancedTab.setText(SecurityUIMsg.CERTVIEW_LABEL_DETAILS);
		Composite advTabComposite = new Composite(tabFolder, SWT.NONE);
		advTabComposite.setLayout(new FillLayout(SWT.VERTICAL));

		CertificateViewer certViewer = new CertificateViewer(advTabComposite);
		certViewer.setCertificate(theCert);
		advancedTab.setControl(advTabComposite);
	}

	protected void setShellStyle(int newShellStyle) {

		super.setShellStyle(newShellStyle | SWT.RESIZE | SWT.DIALOG_TRIM);
	}

	protected void createButtonsForButtonBar(Composite parent) {
		// The default has only a "Close" button, but it returns the CANCEL Id
		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CLOSE_LABEL, true);

	}

	public boolean close() {
		if (titleImage != null) {
			titleImage.dispose();
		}
		return super.close();
	}

}




/*******************************************************************************
 * Copyright (c) 2008,  Jay Rosenthal
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     Jay Rosenthal - initial API and implementation
 *******************************************************************************/

package org.eclipse.equinox.internal.security.ui;

import java.util.ArrayList;
import java.util.Iterator;
import javax.security.auth.x500.X500Principal;

/**
 * X500PrincipalHelper
 * <p>
 * Helper class to extract pieces (attributes) of an X500Principal object for display
 * in the UI.
 * <p>
 * This helper uses the X500Principal.RFC2253 format of X500Principal.getname() to parse an X500Principal name 
 *   into it's component parts. 
 *  <p> 
 * In principals which contain multiple occurrences of the same attribute,the default for all the methods 
 *  is to return the most significant (first) attribute found. 
 *    
 */

public class X500PrincipalHelper {
	public static int LEASTSIGNIFICANT = 0;
	public static int MOSTSIGNIFICANT = 1;

	public final static String attrCN = "CN"; //$NON-NLS-1$
	public final static String attrOU = "OU"; //$NON-NLS-1$
	public final static String attrO = "O"; //$NON-NLS-1$
	public final static String attrC = "C"; //$NON-NLS-1$
	public final static String attrL = "L"; //$NON-NLS-1$
	public final static String attrST = "ST"; //$NON-NLS-1$
	public final static String attrSTREET = "STREET";//$NON-NLS-1$
	public final static String attrEMAIL = "EMAILADDRESS"; //$NON-NLS-1$
	public final static String attrUID = "UID"; //$NON-NLS-1$

	ArrayList rdnNameArray = new ArrayList();

	private final static String attrTerminator = "="; //$NON-NLS-1$

	public X500PrincipalHelper() {
		// Do nothing constructor..
		// Wont be useful unless setPrincipal is called...
	}

	public X500PrincipalHelper(X500Principal principal) {
		parseDN(principal.getName(X500Principal.RFC2253));
	}

	/**
	 *  Set the X500Principal name object to be parsed.
	 *  <p>
	 * @param principal - X500Principal
	 */
	public void setPrincipal(X500Principal principal) {
		parseDN(principal.getName(X500Principal.RFC2253));
	}

	/**
	 *   Gets the most significant common name (CN) attribute from the given
	 *      X500Principal object.
	 *   For names that contains multiple attributes of this type.  The first
	 *      (most significant) one will be returned   
	 * <p> 
	 * @return the Most significant common name attribute.
	 * 
	 */
	public String getCN() {
		return findPart(attrCN);
	}

	/**
	 *   Gets the most significant Organizational Unit (OU) attribute from the given
	 *      X500Principal object.
	 *   For names that contains multiple attributes of this type.  The first
	 *      (most significant) one will be returned       
	 * <p> 
	 * 
	 * @return the Most significant OU attribute.
	 * 
	 */

	public String getOU() {
		return findPart(attrOU);

	}

	/**
	 *   Gets the most significant Organization (O) attribute from the given
	 *      X500Principal object.
	 *   For names that contains multiple attributes of this type.  The first
	 *      (most significant) one will be returned       
	 * <p> 
	 * 
	 * @return the Most significant O attribute.
	 * 
	 */

	public String getO() {
		return findPart(attrO);

	}

	/**
	 *   Gets the Country (C) attribute from the given
	 *      X500Principal object.      
	 * <p> 
	 * 
	 * @return the C attribute.
	 * 
	 */
	public String getC() {
		return findPart(attrC);
	}

	/**
	 *   Gets the Locale (L) attribute from the given
	 *      X500Principal object.      
	 * <p> 
	 * 
	 * @return the L attribute.
	 * 
	 */
	public String getL() {
		return findPart(attrL);
	}

	/**
	 *   Gets the State (ST) attribute from the given
	 *      X500Principal object.      
	 * <p> 
	 * 
	 * @return the ST attribute.
	 * 
	 */
	public String getST() {
		return findPart(attrST);
	}

	/**
	 *   Gets the Street (STREET) attribute from the given
	 *      X500Principal object.      
	 * <p> 
	 * 
	 * @return the STREET attribute.
	 * 
	 */
	public String getSTREET() {
		return findPart(attrSTREET);
	}

	/**
	 *   Gets the Email Address (EMAILADDRESS) attribute from the given
	 *      X500Principal object.      
	 * <p> 
	 * 
	 * @return the EMAILADDRESS attribute.
	 * 
	 */
	public String getEMAILDDRESS() {
		return findPart(attrEMAIL);
	}

	public String getUID() {
		return findPart(attrUID);
	}

	/**
	 * Derived From: org.eclipse.osgi.internal.verifier - DNChainMatching.java
	 * 
	 * Takes a distinguished name in canonical form and fills in the rdnArray
	 * with the extracted RDNs.
	 * 
	 * @param dn the distinguished name in canonical form.
	 * @throws IllegalArgumentException if a formatting error is found.
	 */
	private void parseDN(String dn) throws IllegalArgumentException {
		int startIndex = 0;
		char c = '\0';
		ArrayList nameValues = new ArrayList();

		// Clear the existing array, in case this instance is being re-used
		rdnNameArray.clear();

		while (startIndex < dn.length()) {
			int endIndex;
			for (endIndex = startIndex; endIndex < dn.length(); endIndex++) {
				c = dn.charAt(endIndex);
				if (c == ',' || c == '+')
					break;
				if (c == '\\') {
					endIndex++; // skip the escaped char
				}
			}

			if (endIndex > dn.length())
				throw new IllegalArgumentException("unterminated escape " + dn); //$NON-NLS-1$

			nameValues.add(dn.substring(startIndex, endIndex));

			if (c != '+') {
				rdnNameArray.add(nameValues);
				if (endIndex != dn.length())
					nameValues = new ArrayList();
				else
					nameValues = null;
			}
			startIndex = endIndex + 1;
		}
		if (nameValues != null) {
			throw new IllegalArgumentException("improperly terminated DN " + dn); //$NON-NLS-1$
		}
	}

	/**
	 * Returns an ArrayList containing all the values for the given attribute identifier.
	 * <p>
	 * @param  attributeID  String containing the X500 name attribute whose values are to be 
	 *      returned
	 * @return ArrayList containing the string values of the requested attribute. Values are in   
	 *      the order they occur.  May be empty.
	 * 
	 */
	public ArrayList getAllValues(String attributeID) {
		ArrayList retList = new ArrayList();
		String searchPart = attributeID + attrTerminator;

		for (Iterator iter = rdnNameArray.iterator(); iter.hasNext();) {
			ArrayList nameList = (ArrayList) iter.next();
			String namePart = (String) nameList.get(0);

			if (namePart.startsWith(searchPart)) {
				// Return the string starting after the ID string and the = sign that follows it.
				retList.add(namePart.toString().substring(searchPart.length()));
			}
		}

		return retList;

	}

	private String findPart(String attributeID) {
		return findSignificantPart(attributeID, MOSTSIGNIFICANT);
	}

	private String findSignificantPart(String attributeID, int significance) {
		String retNamePart = null;
		String searchPart = attributeID + attrTerminator;

		for (Iterator iter = rdnNameArray.iterator(); iter.hasNext();) {
			ArrayList nameList = (ArrayList) iter.next();
			String namePart = (String) nameList.get(0);

			if (namePart.startsWith(searchPart)) {
				// Return the string starting after the ID string and the = sign that follows it.
				retNamePart = namePart.toString().substring(searchPart.length());
				//  By definition the first one is most significant
				if (significance == MOSTSIGNIFICANT)
					break;
			}
		}

		return retNamePart;
	}

}

Lines 12-18 Link Here

(-)src/org/eclipse/equinox/internal/security/ui/SecurityStatusControl.java (-1 / +1 lines)
12		12
13	import org.eclipse.core.runtime.*;	13	import org.eclipse.core.runtime.*;
14	import org.eclipse.core.runtime.jobs.Job;	14	import org.eclipse.core.runtime.jobs.Job;
15	import org.eclipse.equinox.internal.provisional.security.ui.services.AuthorizationManager;	15	import org.eclipse.equinox.internal.provisional.security.ui.AuthorizationManager;
16	import org.eclipse.jface.action.ControlContribution;	16	import org.eclipse.jface.action.ControlContribution;
17	import org.eclipse.jface.resource.ImageDescriptor;	17	import org.eclipse.jface.resource.ImageDescriptor;
18	import org.eclipse.swt.SWT;	18	import org.eclipse.swt.SWT;




<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <title>Package-level Javadoc</title>
</head>
<body>
Equinox security UI contributions  
<h2>
Package Specification</h2>
<p>This package provides access to the Equinox security UI contributions.
</p>
</body>
</html>




/*******************************************************************************
 * Copyright (c) 2007, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.equinox.internal.provisional.security.ui.actions;

import org.eclipse.equinox.internal.security.ui.SecurityStatusControl;
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.actions.ContributionItemFactory;

/**
 * Access to security related contribution items for the workbench.
 * <p>
 * Clients may declare subclasses that provide additional application-specific
 * contribution item factories.
 * </p>
 */
public abstract class SecurityContributionItemFactory {

	/**
	 * Id of contribution items created by this factory.
	 */
	private final String contributionItemId;

	/**
	* Creates a new contribution item factory with the given id.
	* @param contributionItemId the id of contribution items created by this factory
	*/
	protected SecurityContributionItemFactory(String contributionItemId) {
		this.contributionItemId = contributionItemId;
	}

	/**
	 * Returns the id of this contribution item factory.
	 * @return the id of contribution items created by this factory
	 */
	public String getId() {
		return contributionItemId;
	}

	/**
	 * Workbench contribution item (id &quot;securityStatus&quot;): An icon for 
	 * evaluating and inspecting the security status of the system.
	 */
	public static final ContributionItemFactory SECURITY_STATUS = new ContributionItemFactory("securityStatus") {//$NON-NLS-1$
		public IContributionItem create(IWorkbenchWindow window) {
			if (window == null)
				throw new IllegalArgumentException();
			return new SecurityStatusControl(window, getId());
		}
	};
}

Lines 22-29 Link Here

(-)META-INF/MANIFEST.MF (-2 / +1 lines)
22	org.eclipse.equinox.preferences;bundle-version="[3.2.200,4.0.0)",	22	org.eclipse.equinox.preferences;bundle-version="[3.2.200,4.0.0)",
23	org.eclipse.ui;bundle-version="[3.4.0,4.0.0)"	23	org.eclipse.ui;bundle-version="[3.4.0,4.0.0)"
24	Bundle-Activator: org.eclipse.equinox.internal.security.ui.Activator	24	Bundle-Activator: org.eclipse.equinox.internal.security.ui.Activator
25	Export-Package: org.eclipse.equinox.internal.provisional.security.ui.actions;version="1.0.0";x-internal:=true,	25	Export-Package: org.eclipse.equinox.internal.provisional.security.ui;version="1.0.0";x-internal:=true,
26	org.eclipse.equinox.internal.provisional.security.ui.services;version="1.0.0";x-internal:=true,
27	org.eclipse.equinox.internal.security.ui;x-internal:=true,	26	org.eclipse.equinox.internal.security.ui;x-internal:=true,
28	org.eclipse.equinox.internal.security.ui.nls;x-internal:=true,	27	org.eclipse.equinox.internal.security.ui.nls;x-internal:=true,
29	org.eclipse.equinox.internal.security.ui.preferences;x-internal:=true,	28	org.eclipse.equinox.internal.security.ui.preferences;x-internal:=true,




/*******************************************************************************
 * Copyright (c) 2007, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.equinox.internal.provisional.security.ui;

import org.eclipse.equinox.internal.security.ui.SecurityStatusControl;
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.actions.ContributionItemFactory;

/**
 * Access to security related contribution items for the workbench.
 * <p>
 * Clients may declare subclasses that provide additional application-specific
 * contribution item factories.
 * </p>
 */
public abstract class SecurityContributionItemFactory {

	/**
	 * Id of contribution items created by this factory.
	 */
	private final String contributionItemId;

	/**
	* Creates a new contribution item factory with the given id.
	* @param contributionItemId the id of contribution items created by this factory
	*/
	protected SecurityContributionItemFactory(String contributionItemId) {
		this.contributionItemId = contributionItemId;
	}

	/**
	 * Returns the id of this contribution item factory.
	 * @return the id of contribution items created by this factory
	 */
	public String getId() {
		return contributionItemId;
	}

	/**
	 * Workbench contribution item (id &quot;securityStatus&quot;): An icon for 
	 * evaluating and inspecting the security status of the system.
	 */
	public static final ContributionItemFactory SECURITY_STATUS = new ContributionItemFactory("securityStatus") {//$NON-NLS-1$
		public IContributionItem create(IWorkbenchWindow window) {
			if (window == null)
				throw new IllegalArgumentException();
			return new SecurityStatusControl(window, getId());
		}
	};
}




/*******************************************************************************
 * Copyright (c) 2008,  Jay Rosenthal
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     Jay Rosenthal - initial API and implementation
 *******************************************************************************/

package org.eclipse.equinox.internal.provisional.security.ui;

import java.util.ArrayList;
import java.util.Iterator;
import javax.security.auth.x500.X500Principal;

/**
 * X500PrincipalHelper
 * <p>
 * Helper class to extract pieces (attributes) of an X500Principal object for display
 * in the UI.
 * <p>
 * This helper uses the X500Principal.RFC2253 format of X500Principal.getname() to parse an X500Principal name 
 *   into it's component parts. 
 *  <p> 
 * In principals which contain multiple occurrences of the same attribute,the default for all the methods 
 *  is to return the most significant (first) attribute found. 
 *    
 */

public class X500PrincipalHelper {
	public static int LEASTSIGNIFICANT = 0;
	public static int MOSTSIGNIFICANT = 1;

	public final static String attrCN = "CN"; //$NON-NLS-1$
	public final static String attrOU = "OU"; //$NON-NLS-1$
	public final static String attrO = "O"; //$NON-NLS-1$
	public final static String attrC = "C"; //$NON-NLS-1$
	public final static String attrL = "L"; //$NON-NLS-1$
	public final static String attrST = "ST"; //$NON-NLS-1$
	public final static String attrSTREET = "STREET";//$NON-NLS-1$
	public final static String attrEMAIL = "EMAILADDRESS"; //$NON-NLS-1$
	public final static String attrUID = "UID"; //$NON-NLS-1$

	ArrayList rdnNameArray = new ArrayList();

	private final static String attrTerminator = "="; //$NON-NLS-1$

	public X500PrincipalHelper() {
		// Do nothing constructor..
		// Wont be useful unless setPrincipal is called...
	}

	public X500PrincipalHelper(X500Principal principal) {
		parseDN(principal.getName(X500Principal.RFC2253));
	}

	/**
	 *  Set the X500Principal name object to be parsed.
	 *  <p>
	 * @param principal - X500Principal
	 */
	public void setPrincipal(X500Principal principal) {
		parseDN(principal.getName(X500Principal.RFC2253));
	}

	/**
	 *   Gets the most significant common name (CN) attribute from the given
	 *      X500Principal object.
	 *   For names that contains multiple attributes of this type.  The first
	 *      (most significant) one will be returned   
	 * <p> 
	 * @return the Most significant common name attribute.
	 * 
	 */
	public String getCN() {
		return findPart(attrCN);
	}

	/**
	 *   Gets the most significant Organizational Unit (OU) attribute from the given
	 *      X500Principal object.
	 *   For names that contains multiple attributes of this type.  The first
	 *      (most significant) one will be returned       
	 * <p> 
	 * 
	 * @return the Most significant OU attribute.
	 * 
	 */

	public String getOU() {
		return findPart(attrOU);

	}

	/**
	 *   Gets the most significant Organization (O) attribute from the given
	 *      X500Principal object.
	 *   For names that contains multiple attributes of this type.  The first
	 *      (most significant) one will be returned       
	 * <p> 
	 * 
	 * @return the Most significant O attribute.
	 * 
	 */

	public String getO() {
		return findPart(attrO);

	}

	/**
	 *   Gets the Country (C) attribute from the given
	 *      X500Principal object.      
	 * <p> 
	 * 
	 * @return the C attribute.
	 * 
	 */
	public String getC() {
		return findPart(attrC);
	}

	/**
	 *   Gets the Locale (L) attribute from the given
	 *      X500Principal object.      
	 * <p> 
	 * 
	 * @return the L attribute.
	 * 
	 */
	public String getL() {
		return findPart(attrL);
	}

	/**
	 *   Gets the State (ST) attribute from the given
	 *      X500Principal object.      
	 * <p> 
	 * 
	 * @return the ST attribute.
	 * 
	 */
	public String getST() {
		return findPart(attrST);
	}

	/**
	 *   Gets the Street (STREET) attribute from the given
	 *      X500Principal object.      
	 * <p> 
	 * 
	 * @return the STREET attribute.
	 * 
	 */
	public String getSTREET() {
		return findPart(attrSTREET);
	}

	/**
	 *   Gets the Email Address (EMAILADDRESS) attribute from the given
	 *      X500Principal object.      
	 * <p> 
	 * 
	 * @return the EMAILADDRESS attribute.
	 * 
	 */
	public String getEMAILDDRESS() {
		return findPart(attrEMAIL);
	}

	public String getUID() {
		return findPart(attrUID);
	}

	/**
	 * Derived From: org.eclipse.osgi.internal.verifier - DNChainMatching.java
	 * 
	 * Takes a distinguished name in canonical form and fills in the rdnArray
	 * with the extracted RDNs.
	 * 
	 * @param dn the distinguished name in canonical form.
	 * @throws IllegalArgumentException if a formatting error is found.
	 */
	private void parseDN(String dn) throws IllegalArgumentException {
		int startIndex = 0;
		char c = '\0';
		ArrayList nameValues = new ArrayList();

		// Clear the existing array, in case this instance is being re-used
		rdnNameArray.clear();

		while (startIndex < dn.length()) {
			int endIndex;
			for (endIndex = startIndex; endIndex < dn.length(); endIndex++) {
				c = dn.charAt(endIndex);
				if (c == ',' || c == '+')
					break;
				if (c == '\\') {
					endIndex++; // skip the escaped char
				}
			}

			if (endIndex > dn.length())
				throw new IllegalArgumentException("unterminated escape " + dn); //$NON-NLS-1$

			nameValues.add(dn.substring(startIndex, endIndex));

			if (c != '+') {
				rdnNameArray.add(nameValues);
				if (endIndex != dn.length())
					nameValues = new ArrayList();
				else
					nameValues = null;
			}
			startIndex = endIndex + 1;
		}
		if (nameValues != null) {
			throw new IllegalArgumentException("improperly terminated DN " + dn); //$NON-NLS-1$
		}
	}

	/**
	 * Returns an ArrayList containing all the values for the given attribute identifier.
	 * <p>
	 * @param  attributeID  String containing the X500 name attribute whose values are to be 
	 *      returned
	 * @return ArrayList containing the string values of the requested attribute. Values are in   
	 *      the order they occur.  May be empty.
	 * 
	 */
	public ArrayList getAllValues(String attributeID) {
		ArrayList retList = new ArrayList();
		String searchPart = attributeID + attrTerminator;

		for (Iterator iter = rdnNameArray.iterator(); iter.hasNext();) {
			ArrayList nameList = (ArrayList) iter.next();
			String namePart = (String) nameList.get(0);

			if (namePart.startsWith(searchPart)) {
				// Return the string starting after the ID string and the = sign that follows it.
				retList.add(namePart.toString().substring(searchPart.length()));
			}
		}

		return retList;

	}

	private String findPart(String attributeID) {
		return findSignificantPart(attributeID, MOSTSIGNIFICANT);
	}

	private String findSignificantPart(String attributeID, int significance) {
		String retNamePart = null;
		String searchPart = attributeID + attrTerminator;

		for (Iterator iter = rdnNameArray.iterator(); iter.hasNext();) {
			ArrayList nameList = (ArrayList) iter.next();
			String namePart = (String) nameList.get(0);

			if (namePart.startsWith(searchPart)) {
				// Return the string starting after the ID string and the = sign that follows it.
				retNamePart = namePart.toString().substring(searchPart.length());
				//  By definition the first one is most significant
				if (significance == MOSTSIGNIFICANT)
					break;
			}
		}

		return retNamePart;
	}

}




<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <title>Package-level Javadoc</title>
</head>
<body>
Equinox security UI contributions  
<h2>
Package Specification</h2>
<p>This package provides access to the Equinox security UI contributions.
</p>
</body>
</html>




/*******************************************************************************
 * Copyright (c) 2007 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.equinox.internal.provisional.security.ui;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.ui.IWorkbenchWindow;

/**
 * The AuthorizationManager is the facility by which the end user
 * is informed of the current state of the system with respect to 
 * bundle authorization based security. 
 */
public abstract class AuthorizationManager {

	public AuthorizationManager() {
		//no content
	}

	/**
	 * Query whether the authorization system is enabled for the system.
	 * 
	 * @return <code>true</code> if and only if authorization is enabled 
	 */
	abstract public boolean isEnabled();

	/**
	 * Returns true when the system is in need of attention from the end
	 * user. This means that some unauthorized content has been encountered, and the 
	 * user has not yet inspected the situation.
	 * 
	 * @return <code>true</code> if user attention is required
	 */
	abstract public boolean needsAttention();

	/**
	 * Return an Eclipse IStatus object representing the current state of the 
	 * authorization system.
	 *
	 * @return IStatus code representing the system status
	 */
	abstract public IStatus getStatus();

	/**
	 * Open the authorization manager user interface so that the end
	 * user can view and edit the system's authorization state.
	 * 
	 * @param workbenchWindow the workbench window
	 */
	abstract public void displayManager(IWorkbenchWindow workbenchWindow);

}




/*******************************************************************************
 * Copyright (c) 2008,  Jay Rosenthal
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     Jay Rosenthal - initial API and implementation
 *******************************************************************************/

package org.eclipse.equinox.internal.provisional.security.ui;

import java.security.cert.X509Certificate;
import java.text.DateFormat;
import org.eclipse.equinox.internal.security.ui.Activator;
import org.eclipse.equinox.internal.security.ui.SecurityUIMsg;
import org.eclipse.equinox.internal.security.ui.wizard.CertificateViewer;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;

public class X509CertificateViewDialog extends TitleAreaDialog {
	private final static String titleImageName = "/titleAreaCert.gif"; //$NON-NLS-1$
	private X509Certificate theCert;
	private static final DateFormat _df = DateFormat.getDateInstance(DateFormat.LONG);
	private X500PrincipalHelper nameHelper = new X500PrincipalHelper();

	// We use the "bannerFont" for our bold font
	private static Font boldFont = JFaceResources.getBannerFont();
	private Image titleImage;

	public X509CertificateViewDialog(Shell parentShell, X509Certificate cert) {
		super(parentShell);
		this.theCert = cert;
	}

	protected Control createContents(Composite parent) {
		return super.createContents(parent);
	}

	protected Control createDialogArea(Composite parent) {
		nameHelper.setPrincipal(theCert.getSubjectX500Principal());

		setTitle((nameHelper.getCN() != null ? nameHelper.getCN() : nameHelper.getOU()));

		titleImage = Activator.getImageDescriptor(titleImageName).createImage();

		if (titleImage != null)
			setTitleImage(titleImage);

		Composite composite = (Composite) super.createDialogArea(parent);

		TabFolder tabFolder = new TabFolder(composite, SWT.BORDER);
		GridData bdata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
		tabFolder.setLayoutData(bdata);

		createBasicTab(tabFolder);

		createAdvancedTab(tabFolder);

		return composite;
	}

	private void createBasicTab(TabFolder tabFolder) {
		String displayName = null;
		int labelIndent = 10;
		int dataIdent = 10;

		TabItem basicTab = new TabItem(tabFolder, SWT.NULL);
		basicTab.setText(SecurityUIMsg.CERTVIEW_LABEL_BASIC);
		Composite basicTabComposite = new Composite(tabFolder, SWT.NONE);

		GridLayout tabLayout = new GridLayout();
		tabLayout.numColumns = 2;
		basicTabComposite.setLayout(tabLayout);

		Label issueToLabel = new Label(basicTabComposite, SWT.NONE);
		issueToLabel.setText(SecurityUIMsg.CERTPROP_X509_ISSUED_TO);
		issueToLabel.setFont(boldFont);
		configureLayout(issueToLabel, 2, 0, 0, 0);

		// Display the RDNs of the Subject
		nameHelper.setPrincipal(theCert.getSubjectX500Principal());

		Label CNLabel = new Label(basicTabComposite, SWT.NONE);
		CNLabel.setText(SecurityUIMsg.X500_LABEL_CN);
		configureLayout(CNLabel, 0, 0, labelIndent, 0);

		Label subjectCN = new Label(basicTabComposite, SWT.NONE);
		displayName = nameHelper.getCN();
		subjectCN.setText((displayName != null ? displayName : SecurityUIMsg.CERTVAL_UNDEFINED));
		configureLayout(subjectCN, 0, 0, dataIdent, 0);

		Label OLabel = new Label(basicTabComposite, SWT.NONE);
		OLabel.setText(SecurityUIMsg.X500_LABEL_O);
		configureLayout(OLabel, 0, 0, labelIndent, 0);

		Label subjectO = new Label(basicTabComposite, SWT.NONE);
		displayName = nameHelper.getO();
		subjectO.setText((displayName != null ? displayName : SecurityUIMsg.CERTVAL_UNDEFINED));
		configureLayout(subjectO, 0, 0, dataIdent, 0);

		Label OULabel = new Label(basicTabComposite, SWT.NONE);
		OULabel.setText(SecurityUIMsg.X500_LABEL_OU);
		configureLayout(OULabel, 0, 0, labelIndent, 0);

		Label subjectOU = new Label(basicTabComposite, SWT.NONE);
		displayName = nameHelper.getOU();
		subjectOU.setText((displayName != null ? displayName : SecurityUIMsg.CERTVAL_UNDEFINED));
		configureLayout(subjectOU, 0, 0, dataIdent, 0);

		Label issueByLabel = new Label(basicTabComposite, SWT.NONE);
		issueByLabel.setText(SecurityUIMsg.CERTPROP_X509_ISSUED_BY);
		configureLayout(issueByLabel, 2, 0, 0, 0);
		issueByLabel.setFont(boldFont);

		// Display the RDNs of the Issuer
		nameHelper.setPrincipal(theCert.getIssuerX500Principal());

		Label CNLabel2 = new Label(basicTabComposite, SWT.NONE);
		CNLabel2.setText(SecurityUIMsg.X500_LABEL_CN);
		configureLayout(CNLabel2, 0, 0, labelIndent, 0);

		Label issuerCN = new Label(basicTabComposite, SWT.NONE);
		displayName = nameHelper.getCN();
		issuerCN.setText((displayName != null ? displayName : SecurityUIMsg.CERTVAL_UNDEFINED));
		configureLayout(issuerCN, 0, 0, dataIdent, 0);

		Label OLabel2 = new Label(basicTabComposite, SWT.NONE);
		OLabel2.setText(SecurityUIMsg.X500_LABEL_O);
		configureLayout(OLabel2, 0, 0, labelIndent, 0);

		Label issuerO = new Label(basicTabComposite, SWT.NONE);
		displayName = nameHelper.getO();
		issuerO.setText((displayName != null ? displayName : SecurityUIMsg.CERTVAL_UNDEFINED));
		configureLayout(issuerO, 0, 0, dataIdent, 0);

		Label OULabel2 = new Label(basicTabComposite, SWT.NONE);
		OULabel2.setText(SecurityUIMsg.X500_LABEL_OU);
		configureLayout(OULabel2, 0, 0, labelIndent, 0);

		Label issuerOU = new Label(basicTabComposite, SWT.NONE);
		displayName = nameHelper.getOU();
		issuerOU.setText((displayName != null ? displayName : SecurityUIMsg.CERTVAL_UNDEFINED));
		configureLayout(issuerOU, 0, 0, dataIdent, 0);

		Label datesLabel = new Label(basicTabComposite, SWT.NONE);
		datesLabel.setText(SecurityUIMsg.CERTVIEW_LABEL_VALIDITY_DATES);
		configureLayout(datesLabel, 2, 0, 0, 0);
		datesLabel.setFont(boldFont);

		Label validFrom = new Label(basicTabComposite, SWT.NONE);
		validFrom.setText(SecurityUIMsg.CERTPROP_X509_VALID_FROM);
		configureLayout(validFrom, 0, 0, labelIndent, 0);

		Label fromDate = new Label(basicTabComposite, SWT.NONE);
		fromDate.setText(_df.format(theCert.getNotBefore()));
		configureLayout(fromDate, 0, 0, dataIdent, 0);

		Label validTo = new Label(basicTabComposite, SWT.NONE);
		validTo.setText(SecurityUIMsg.CERTPROP_X509_VALID_TO);
		configureLayout(validTo, 0, 0, labelIndent, 0);

		Label toDate = new Label(basicTabComposite, SWT.NONE);
		toDate.setText(_df.format(theCert.getNotAfter()));
		configureLayout(toDate, 0, 0, dataIdent, 0);

		basicTab.setControl(basicTabComposite);
	}

	protected static void configureLayout(Control c, int horizontalSpan, int verticalSpan, int horizontalIndent, int vertIndent) {
		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_CENTER);

		gd.horizontalSpan = horizontalSpan;
		gd.verticalSpan = verticalSpan;
		gd.horizontalIndent = horizontalIndent;
		gd.verticalIndent = vertIndent;

		c.setLayoutData(gd);

	}

	private void createAdvancedTab(final TabFolder tabFolder) {
		TabItem advancedTab = new TabItem(tabFolder, SWT.NULL);
		advancedTab.setText(SecurityUIMsg.CERTVIEW_LABEL_DETAILS);
		Composite advTabComposite = new Composite(tabFolder, SWT.NONE);
		advTabComposite.setLayout(new FillLayout(SWT.VERTICAL));

		CertificateViewer certViewer = new CertificateViewer(advTabComposite);
		certViewer.setCertificate(theCert);
		advancedTab.setControl(advTabComposite);
	}

	protected void setShellStyle(int newShellStyle) {

		super.setShellStyle(newShellStyle | SWT.RESIZE | SWT.DIALOG_TRIM);
	}

	protected void createButtonsForButtonBar(Composite parent) {
		// The default has only a "Close" button, but it returns the CANCEL Id
		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CLOSE_LABEL, true);

	}

	public boolean close() {
		if (titleImage != null) {
			titleImage.dispose();
		}
		return super.close();
	}

}

Return to bug 220805

Removed Link Here

(-)src/org/eclipse/equinox/internal/provisional/security/ui/services/package.html (-14 lines)
1	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
2	<html>
3	<head>
4	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
5	<title>Package-level Javadoc</title>
6	</head>
7	<body>
8	Equinox security UI-related services
9	<h2>
10	Package Specification</h2>
11	<p>This package provides an infrastructure and helper utilities for the Equinox security UI services.
12	</p>
13	</body>
14	</html>

Removed Link Here

(-)src/org/eclipse/equinox/internal/provisional/security/ui/services/AuthorizationManager.java (-59 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.equinox.internal.provisional.security.ui.services;
12
13	import org.eclipse.core.runtime.IStatus;
14	import org.eclipse.ui.IWorkbenchWindow;
15
16	/**
17	* The AuthorizationManager is the facility by which the end user
18	* is informed of the current state of the system with respect to
19	* bundle authorization based security.
20	*/
21	public abstract class AuthorizationManager {
22
23	public AuthorizationManager() {
24	//no content
25	}
26
27	/**
28	* Query whether the authorization system is enabled for the system.
29	*
30	* @return <code>true</code> if and only if authorization is enabled
31	*/
32	abstract public boolean isEnabled();
33
34	/**
35	* Returns true when the system is in need of attention from the end
36	* user. This means that some unauthorized content has been encountered, and the
37	* user has not yet inspected the situation.
38	*
39	* @return <code>true</code> if user attention is required
40	*/
41	abstract public boolean needsAttention();
42
43	/**
44	* Return an Eclipse IStatus object representing the current state of the
45	* authorization system.
46	*
47	* @return IStatus code representing the system status
48	*/
49	abstract public IStatus getStatus();
50
51	/**
52	* Open the authorization manager user interface so that the end
53	* user can view and edit the system's authorization state.
54	*
55	* @param workbenchWindow the workbench window
56	*/
57	abstract public void displayManager(IWorkbenchWindow workbenchWindow);
58
59	}

Removed Link Here

(-)src/org/eclipse/equinox/internal/security/ui/X509CertificateViewDialog.java (-217 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008, Jay Rosenthal
3	*
4	* All rights reserved. This program and the accompanying materials
5	* are made available under the terms of the Eclipse Public License v1.0
6	* which accompanies this distribution, and is available at
7	* http://www.eclipse.org/legal/epl-v10.html
8	*
9	* Contributors:
10	* Jay Rosenthal - initial API and implementation
11	*******************************************************************************/
12
13	package org.eclipse.equinox.internal.security.ui;
14
15	import java.security.cert.X509Certificate;
16	import java.text.DateFormat;
17	import org.eclipse.equinox.internal.security.ui.wizard.CertificateViewer;
18	import org.eclipse.jface.dialogs.IDialogConstants;
19	import org.eclipse.jface.dialogs.TitleAreaDialog;
20	import org.eclipse.jface.resource.JFaceResources;
21	import org.eclipse.swt.SWT;
22	import org.eclipse.swt.graphics.Font;
23	import org.eclipse.swt.graphics.Image;
24	import org.eclipse.swt.layout.*;
25	import org.eclipse.swt.widgets.*;
26
27	public class X509CertificateViewDialog extends TitleAreaDialog {
28	private final static String titleImageName = "/titleAreaCert.gif"; //$NON-NLS-1$
29	private X509Certificate theCert;
30	private static final DateFormat _df = DateFormat.getDateInstance(DateFormat.LONG);
31	private X500PrincipalHelper nameHelper = new X500PrincipalHelper();
32
33	// We use the "bannerFont" for our bold font
34	private static Font boldFont = JFaceResources.getBannerFont();
35	private Image titleImage;
36
37	public X509CertificateViewDialog(Shell parentShell, X509Certificate cert) {
38	super(parentShell);
39	this.theCert = cert;
40	}
41
42	protected Control createContents(Composite parent) {
43	return super.createContents(parent);
44	}
45
46	protected Control createDialogArea(Composite parent) {
47	nameHelper.setPrincipal(theCert.getSubjectX500Principal());
48
49	setTitle((nameHelper.getCN() != null ? nameHelper.getCN() : nameHelper.getOU()));
50
51	titleImage = Activator.getImageDescriptor(titleImageName).createImage();
52
53	if (titleImage != null)
54	setTitleImage(titleImage);
55
56	Composite composite = (Composite) super.createDialogArea(parent);
57
58	TabFolder tabFolder = new TabFolder(composite, SWT.BORDER);
59	GridData bdata = new GridData(GridData.HORIZONTAL_ALIGN_FILL \| GridData.VERTICAL_ALIGN_FILL \| GridData.GRAB_VERTICAL);
60	tabFolder.setLayoutData(bdata);
61
62	createBasicTab(tabFolder);
63
64	createAdvancedTab(tabFolder);
65
66	return composite;
67	}
68
69	private void createBasicTab(TabFolder tabFolder) {
70	String displayName = null;
71	int labelIndent = 10;
72	int dataIdent = 10;
73
74	TabItem basicTab = new TabItem(tabFolder, SWT.NULL);
75	basicTab.setText(SecurityUIMsg.CERTVIEW_LABEL_BASIC);
76	Composite basicTabComposite = new Composite(tabFolder, SWT.NONE);
77
78	GridLayout tabLayout = new GridLayout();
79	tabLayout.numColumns = 2;
80	basicTabComposite.setLayout(tabLayout);
81
82	Label issueToLabel = new Label(basicTabComposite, SWT.NONE);
83	issueToLabel.setText(SecurityUIMsg.CERTPROP_X509_ISSUED_TO);
84	issueToLabel.setFont(boldFont);
85	configureLayout(issueToLabel, 2, 0, 0, 0);
86
87	// Display the RDNs of the Subject
88	nameHelper.setPrincipal(theCert.getSubjectX500Principal());
89
90	Label CNLabel = new Label(basicTabComposite, SWT.NONE);
91	CNLabel.setText(SecurityUIMsg.X500_LABEL_CN);
92	configureLayout(CNLabel, 0, 0, labelIndent, 0);
93
94	Label subjectCN = new Label(basicTabComposite, SWT.NONE);
95	displayName = nameHelper.getCN();
96	subjectCN.setText((displayName != null ? displayName : SecurityUIMsg.CERTVAL_UNDEFINED));
97	configureLayout(subjectCN, 0, 0, dataIdent, 0);
98
99	Label OLabel = new Label(basicTabComposite, SWT.NONE);
100	OLabel.setText(SecurityUIMsg.X500_LABEL_O);
101	configureLayout(OLabel, 0, 0, labelIndent, 0);
102
103	Label subjectO = new Label(basicTabComposite, SWT.NONE);
104	displayName = nameHelper.getO();
105	subjectO.setText((displayName != null ? displayName : SecurityUIMsg.CERTVAL_UNDEFINED));
106	configureLayout(subjectO, 0, 0, dataIdent, 0);
107
108	Label OULabel = new Label(basicTabComposite, SWT.NONE);
109	OULabel.setText(SecurityUIMsg.X500_LABEL_OU);
110	configureLayout(OULabel, 0, 0, labelIndent, 0);
111
112	Label subjectOU = new Label(basicTabComposite, SWT.NONE);
113	displayName = nameHelper.getOU();
114	subjectOU.setText((displayName != null ? displayName : SecurityUIMsg.CERTVAL_UNDEFINED));
115	configureLayout(subjectOU, 0, 0, dataIdent, 0);
116
117	Label issueByLabel = new Label(basicTabComposite, SWT.NONE);
118	issueByLabel.setText(SecurityUIMsg.CERTPROP_X509_ISSUED_BY);
119	configureLayout(issueByLabel, 2, 0, 0, 0);
120	issueByLabel.setFont(boldFont);
121
122	// Display the RDNs of the Issuer
123	nameHelper.setPrincipal(theCert.getIssuerX500Principal());
124
125	Label CNLabel2 = new Label(basicTabComposite, SWT.NONE);
126	CNLabel2.setText(SecurityUIMsg.X500_LABEL_CN);
127	configureLayout(CNLabel2, 0, 0, labelIndent, 0);
128
129	Label issuerCN = new Label(basicTabComposite, SWT.NONE);
130	displayName = nameHelper.getCN();
131	issuerCN.setText((displayName != null ? displayName : SecurityUIMsg.CERTVAL_UNDEFINED));
132	configureLayout(issuerCN, 0, 0, dataIdent, 0);
133
134	Label OLabel2 = new Label(basicTabComposite, SWT.NONE);
135	OLabel2.setText(SecurityUIMsg.X500_LABEL_O);
136	configureLayout(OLabel2, 0, 0, labelIndent, 0);
137
138	Label issuerO = new Label(basicTabComposite, SWT.NONE);
139	displayName = nameHelper.getO();
140	issuerO.setText((displayName != null ? displayName : SecurityUIMsg.CERTVAL_UNDEFINED));
141	configureLayout(issuerO, 0, 0, dataIdent, 0);
142
143	Label OULabel2 = new Label(basicTabComposite, SWT.NONE);
144	OULabel2.setText(SecurityUIMsg.X500_LABEL_OU);
145	configureLayout(OULabel2, 0, 0, labelIndent, 0);
146
147	Label issuerOU = new Label(basicTabComposite, SWT.NONE);
148	displayName = nameHelper.getOU();
149	issuerOU.setText((displayName != null ? displayName : SecurityUIMsg.CERTVAL_UNDEFINED));
150	configureLayout(issuerOU, 0, 0, dataIdent, 0);
151
152	Label datesLabel = new Label(basicTabComposite, SWT.NONE);
153	datesLabel.setText(SecurityUIMsg.CERTVIEW_LABEL_VALIDITY_DATES);
154	configureLayout(datesLabel, 2, 0, 0, 0);
155	datesLabel.setFont(boldFont);
156
157	Label validFrom = new Label(basicTabComposite, SWT.NONE);
158	validFrom.setText(SecurityUIMsg.CERTPROP_X509_VALID_FROM);
159	configureLayout(validFrom, 0, 0, labelIndent, 0);
160
161	Label fromDate = new Label(basicTabComposite, SWT.NONE);
162	fromDate.setText(_df.format(theCert.getNotBefore()));
163	configureLayout(fromDate, 0, 0, dataIdent, 0);
164
165	Label validTo = new Label(basicTabComposite, SWT.NONE);
166	validTo.setText(SecurityUIMsg.CERTPROP_X509_VALID_TO);
167	configureLayout(validTo, 0, 0, labelIndent, 0);
168
169	Label toDate = new Label(basicTabComposite, SWT.NONE);
170	toDate.setText(_df.format(theCert.getNotAfter()));
171	configureLayout(toDate, 0, 0, dataIdent, 0);
172
173	basicTab.setControl(basicTabComposite);
174	}
175
176	protected static void configureLayout(Control c, int horizontalSpan, int verticalSpan, int horizontalIndent, int vertIndent) {
177	GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING \| GridData.VERTICAL_ALIGN_CENTER);
178
179	gd.horizontalSpan = horizontalSpan;
180	gd.verticalSpan = verticalSpan;
181	gd.horizontalIndent = horizontalIndent;
182	gd.verticalIndent = vertIndent;
183
184	c.setLayoutData(gd);
185
186	}
187
188	private void createAdvancedTab(final TabFolder tabFolder) {
189	TabItem advancedTab = new TabItem(tabFolder, SWT.NULL);
190	advancedTab.setText(SecurityUIMsg.CERTVIEW_LABEL_DETAILS);
191	Composite advTabComposite = new Composite(tabFolder, SWT.NONE);
192	advTabComposite.setLayout(new FillLayout(SWT.VERTICAL));
193
194	CertificateViewer certViewer = new CertificateViewer(advTabComposite);
195	certViewer.setCertificate(theCert);
196	advancedTab.setControl(advTabComposite);
197	}
198
199	protected void setShellStyle(int newShellStyle) {
200
201	super.setShellStyle(newShellStyle \| SWT.RESIZE \| SWT.DIALOG_TRIM);
202	}
203
204	protected void createButtonsForButtonBar(Composite parent) {
205	// The default has only a "Close" button, but it returns the CANCEL Id
206	createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CLOSE_LABEL, true);
207
208	}
209
210	public boolean close() {
211	if (titleImage != null) {
212	titleImage.dispose();
213	}
214	return super.close();
215	}
216
217	}

Removed Link Here

(-)src/org/eclipse/equinox/internal/provisional/security/ui/actions/SecurityContributionItemFactory.java (-59 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.equinox.internal.provisional.security.ui.actions;
12
13	import org.eclipse.equinox.internal.security.ui.SecurityStatusControl;
14	import org.eclipse.jface.action.IContributionItem;
15	import org.eclipse.ui.IWorkbenchWindow;
16	import org.eclipse.ui.actions.ContributionItemFactory;
17
18	/**
19	* Access to security related contribution items for the workbench.
20	* <p>
21	* Clients may declare subclasses that provide additional application-specific
22	* contribution item factories.
23	* </p>
24	*/
25	public abstract class SecurityContributionItemFactory {
26
27	/**
28	* Id of contribution items created by this factory.
29	*/
30	private final String contributionItemId;
31
32	/**
33	* Creates a new contribution item factory with the given id.
34	* @param contributionItemId the id of contribution items created by this factory
35	*/
36	protected SecurityContributionItemFactory(String contributionItemId) {
37	this.contributionItemId = contributionItemId;
38	}
39
40	/**
41	* Returns the id of this contribution item factory.
42	* @return the id of contribution items created by this factory
43	*/
44	public String getId() {
45	return contributionItemId;
46	}
47
48	/**
49	* Workbench contribution item (id "securityStatus"): An icon for
50	* evaluating and inspecting the security status of the system.
51	*/
52	public static final ContributionItemFactory SECURITY_STATUS = new ContributionItemFactory("securityStatus") {//$NON-NLS-1$
53	public IContributionItem create(IWorkbenchWindow window) {
54	if (window == null)
55	throw new IllegalArgumentException();
56	return new SecurityStatusControl(window, getId());
57	}
58	};
59	}