Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding DLP Quickstart + redact image sample #797

Merged
merged 4 commits into from
Aug 9, 2017
Merged

adding DLP Quickstart + redact image sample #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18df6fa
adding DLP Quickstart + redact image sample
jabubake Aug 9, 2017
76cce0a
Merge branch 'master' into dlp_quickstart
jabubake Aug 9, 2017
9a5b08b
adding comments
jabubake Aug 9, 2017
765f757
Merge branch 'dlp_quickstart' of https://github.com/GoogleCloudPlatfo…
jabubake Aug 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion dlp/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ info types for a given category. eg. HEALTH or GOVERNMENT.
java -cp target/dlp-samples-1.0-jar-with-dependencies.jar com.example.dlp.Metadata
```

## Run the quickstart

The Quickstart demonstrates using the DLP API to identify an InfoType in a given string.
```
java -cp target/dlp-samples-1.0-jar-with-dependencies.jar com.example.dlp.QuickStart
```

## Inspect data for sensitive elements
Inspect strings, files locally and on Google Cloud Storage and Cloud Datastore kinds with the DLP API.

Expand Down Expand Up @@ -112,4 +119,3 @@ Run all tests:
```
mvn clean verify
```

232 changes: 115 additions & 117 deletions dlp/src/main/java/com/example/dlp/Inspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/**
* Copyright 2017, Google, Inc.
* Copyright 2017 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand Down Expand Up @@ -38,15 +39,6 @@
import com.google.privacy.dlp.v2beta1.ResultName;
import com.google.privacy.dlp.v2beta1.StorageConfig;
import com.google.protobuf.ByteString;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionGroup;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;

import java.net.URLConnection;
import java.nio.file.Files;
import java.nio.file.Path;
Expand All @@ -55,11 +47,23 @@
import java.util.Collections;
import java.util.List;
import javax.activation.MimetypesFileTypeMap;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionGroup;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;

public class Inspect {

private static void inspectString(String string, Likelihood minLikelihood, int maxFindings,
List<InfoType> infoTypes, boolean includeQuote) {
private static void inspectString(
String string,
Likelihood minLikelihood,
int maxFindings,
List<InfoType> infoTypes,
boolean includeQuote) {
// [START dlp_inspect_string]
// instantiate a client
try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
Expand All @@ -75,24 +79,24 @@ private static void inspectString(String string, Likelihood minLikelihood, int m

// Whether to include the matching string
// includeQuote = true;
InspectConfig inspectConfig = InspectConfig.newBuilder()
.addAllInfoTypes(infoTypes)
.setMinLikelihood(minLikelihood)
.setMaxFindings(maxFindings)
.setIncludeQuote(includeQuote)
.build();
InspectConfig inspectConfig =
InspectConfig.newBuilder()
.addAllInfoTypes(infoTypes)
.setMinLikelihood(minLikelihood)
.setMaxFindings(maxFindings)
.setIncludeQuote(includeQuote)
.build();

// The string to inspect
// string = 'My name is Gary and my email is gary@example.com';
ContentItem contentItem = ContentItem.newBuilder()
.setType("text/plain")
.setValue(string)
.build();

InspectContentRequest request = InspectContentRequest.newBuilder()
.setInspectConfig(inspectConfig)
.addItems(contentItem)
.build();
ContentItem contentItem =
ContentItem.newBuilder().setType("text/plain").setValue(string).build();

InspectContentRequest request =
InspectContentRequest.newBuilder()
.setInspectConfig(inspectConfig)
.addItems(contentItem)
.build();
InspectContentResponse response = dlpServiceClient.inspectContent(request);

for (InspectResult result : response.getResultsList()) {
Expand All @@ -115,8 +119,12 @@ private static void inspectString(String string, Likelihood minLikelihood, int m
// [END dlp_inspect_string]
}

private static void inspectFile(String filePath, Likelihood minLikelihood, int maxFindings,
List<InfoType> infoTypes, boolean includeQuote) {
private static void inspectFile(
String filePath,
Likelihood minLikelihood,
int maxFindings,
List<InfoType> infoTypes,
boolean includeQuote) {
// [START dlp_inspect_file]
// Instantiates a client
try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
Expand Down Expand Up @@ -146,22 +154,22 @@ private static void inspectFile(String filePath, Likelihood minLikelihood, int m
}

byte[] data = Files.readAllBytes(path);
ContentItem contentItem = ContentItem.newBuilder()
.setType(mimeType)
.setData(ByteString.copyFrom(data))
.build();

InspectConfig inspectConfig = InspectConfig.newBuilder()
.addAllInfoTypes(infoTypes)
.setMinLikelihood(minLikelihood)
.setMaxFindings(maxFindings)
.setIncludeQuote(includeQuote)
.build();

InspectContentRequest request = InspectContentRequest.newBuilder()
.setInspectConfig(inspectConfig)
.addItems(contentItem)
.build();
ContentItem contentItem =
ContentItem.newBuilder().setType(mimeType).setData(ByteString.copyFrom(data)).build();

InspectConfig inspectConfig =
InspectConfig.newBuilder()
.addAllInfoTypes(infoTypes)
.setMinLikelihood(minLikelihood)
.setMaxFindings(maxFindings)
.setIncludeQuote(includeQuote)
.build();

InspectContentRequest request =
InspectContentRequest.newBuilder()
.setInspectConfig(inspectConfig)
.addItems(contentItem)
.build();
InspectContentResponse response = dlpServiceClient.inspectContent(request);

for (InspectResult result : response.getResultsList()) {
Expand All @@ -185,13 +193,13 @@ private static void inspectFile(String filePath, Likelihood minLikelihood, int m
// [END dlp_inspect_file]
}

private static void inspectGcsFile(String bucketName, String fileName,
Likelihood minLikelihood, List<InfoType> infoTypes)
private static void inspectGcsFile(
String bucketName, String fileName, Likelihood minLikelihood, List<InfoType> infoTypes)
throws Exception {
// [START dlp_inspect_gcs]
// Instantiates a client
try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
// The name of the bucket where the file resides.
// The name of the bucket where the file resides.
// bucketName = 'YOUR-BUCKET';

// The path to the file within the bucket to inspect.
Expand All @@ -207,21 +215,19 @@ private static void inspectGcsFile(String bucketName, String fileName,
// The infoTypes of information to match
// infoTypes = ['US_MALE_NAME', 'US_FEMALE_NAME'];

CloudStorageOptions cloudStorageOptions = CloudStorageOptions
.newBuilder()
.setFileSet(FileSet.newBuilder().setUrl(
"gs://" + bucketName + "/" + fileName
))
.build();
CloudStorageOptions cloudStorageOptions =
CloudStorageOptions.newBuilder()
.setFileSet(FileSet.newBuilder().setUrl("gs://" + bucketName + "/" + fileName))
.build();

StorageConfig storageConfig = StorageConfig.newBuilder()
.setCloudStorageOptions(cloudStorageOptions)
.build();
StorageConfig storageConfig =
StorageConfig.newBuilder().setCloudStorageOptions(cloudStorageOptions).build();

InspectConfig inspectConfig = InspectConfig.newBuilder()
.addAllInfoTypes(infoTypes)
.setMinLikelihood(minLikelihood)
.build();
InspectConfig inspectConfig =
InspectConfig.newBuilder()
.addAllInfoTypes(infoTypes)
.setMinLikelihood(minLikelihood)
.build();

// optionally provide an output configuration to store results, default : none
OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance();
Expand Down Expand Up @@ -252,8 +258,12 @@ private static void inspectGcsFile(String bucketName, String fileName,
// [END dlp_inspect_gcs]
}

private static void inspectDatastore(String projectId, String namespaceId, String kind,
Likelihood minLikelihood, List<InfoType> infoTypes) {
private static void inspectDatastore(
String projectId,
String namespaceId,
String kind,
Likelihood minLikelihood,
List<InfoType> infoTypes) {
// [START dlp_inspect_datastore]
// Instantiates a client
try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
Expand All @@ -274,19 +284,24 @@ private static void inspectDatastore(String projectId, String namespaceId, Strin
// The infoTypes of information to match
// infoTypes = ['US_MALE_NAME', 'US_FEMALE_NAME'];

// Get reference to the file to be inspected
PartitionId partitionId = PartitionId.newBuilder().setProjectId(projectId)
.setNamespaceId(namespaceId).build();
// Reference to the Datastore namespace
PartitionId partitionId =
PartitionId.newBuilder().setProjectId(projectId).setNamespaceId(namespaceId).build();

// Reference to the Datastore kind
KindExpression kindExpression = KindExpression.newBuilder().setName(kind).build();
DatastoreOptions datastoreOptions = DatastoreOptions.newBuilder()
.setKind(kindExpression).setPartitionId(partitionId).build();
StorageConfig storageConfig = StorageConfig.newBuilder()
.setDatastoreOptions(datastoreOptions).build();
DatastoreOptions datastoreOptions =
DatastoreOptions.newBuilder().setKind(kindExpression).setPartitionId(partitionId).build();

// Construct Datastore configuration to be inspected
StorageConfig storageConfig =
StorageConfig.newBuilder().setDatastoreOptions(datastoreOptions).build();

InspectConfig inspectConfig = InspectConfig.newBuilder()
.addAllInfoTypes(infoTypes)
.setMinLikelihood(minLikelihood)
.build();
InspectConfig inspectConfig =
InspectConfig.newBuilder()
.addAllInfoTypes(infoTypes)
.setMinLikelihood(minLikelihood)
.build();

// optionally provide an output configuration to store results, default : none
OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance();
Expand Down Expand Up @@ -317,6 +332,10 @@ private static void inspectDatastore(String projectId, String namespaceId, Strin
// [END dlp_inspect_datastore]
}

/**
* Command line application to inspect data using the Data Loss Prevention API.
* Supported data formats : string, file, text files on GCS and Datastore entities
*/
public static void main(String[] args) throws Exception {

OptionGroup optionsGroup = new OptionGroup();
Expand All @@ -336,61 +355,37 @@ public static void main(String[] args) throws Exception {
Options commandLineOptions = new Options();
commandLineOptions.addOptionGroup(optionsGroup);

Option minLikelihoodOption = Option.builder("minLikelihood")
.hasArg(true)
.required(false)
.build();
Option minLikelihoodOption =
Option.builder("minLikelihood").hasArg(true).required(false).build();

commandLineOptions.addOption(minLikelihoodOption);

Option maxFindingsOption = Option.builder("maxFindings")
.hasArg(true)
.required(false)
.build();
Option maxFindingsOption = Option.builder("maxFindings").hasArg(true).required(false).build();

commandLineOptions.addOption(maxFindingsOption);

Option infoTypesOption = Option.builder("infoTypes")
.hasArg(true)
.required(false)
.build();
Option infoTypesOption = Option.builder("infoTypes").hasArg(true).required(false).build();
infoTypesOption.setArgs(Option.UNLIMITED_VALUES);
commandLineOptions.addOption(infoTypesOption);

Option includeQuoteOption = Option.builder("includeQuote")
.hasArg(true)
.required(false)
.build();
Option includeQuoteOption = Option.builder("includeQuote").hasArg(true).required(false).build();
commandLineOptions.addOption(includeQuoteOption);

Option bucketNameOption = Option.builder("bucketName")
.hasArg(true)
.required(false)
.build();
Option bucketNameOption = Option.builder("bucketName").hasArg(true).required(false).build();
commandLineOptions.addOption(bucketNameOption);

Option gcsFileNameOption = Option.builder("fileName")
.hasArg(true)
.required(false)
.build();
Option gcsFileNameOption = Option.builder("fileName").hasArg(true).required(false).build();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did we move from many lines to a single line?

Copy link
Contributor Author

@jabubake jabubake Aug 9, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used the Google Java formatter on these files.

commandLineOptions.addOption(gcsFileNameOption);

Option datastoreProjectIdOption = Option.builder("projectId")
.hasArg(true)
.required(false)
.build();
Option datastoreProjectIdOption =
Option.builder("projectId").hasArg(true).required(false).build();
commandLineOptions.addOption(datastoreProjectIdOption);

Option datastoreNamespaceOption = Option.builder("namespace")
.hasArg(true)
.required(false)
.build();
Option datastoreNamespaceOption =
Option.builder("namespace").hasArg(true).required(false).build();
commandLineOptions.addOption(datastoreNamespaceOption);

Option datastoreKindOption = Option.builder("kind")
.hasArg(true)
.required(false)
.build();
Option datastoreKindOption = Option.builder("kind").hasArg(true).required(false).build();
commandLineOptions.addOption(datastoreKindOption);

CommandLineParser parser = new DefaultParser();
Expand All @@ -406,11 +401,13 @@ public static void main(String[] args) throws Exception {
return;
}

Likelihood minLikelihood = Likelihood.valueOf(cmd.getOptionValue(minLikelihoodOption.getOpt(),
Likelihood.LIKELIHOOD_UNSPECIFIED.name()));
Likelihood minLikelihood =
Likelihood.valueOf(
cmd.getOptionValue(
minLikelihoodOption.getOpt(), Likelihood.LIKELIHOOD_UNSPECIFIED.name()));
int maxFindings = Integer.parseInt(cmd.getOptionValue(maxFindingsOption.getOpt(), "0"));
boolean includeQuote = Boolean
.parseBoolean(cmd.getOptionValue(includeQuoteOption.getOpt(), "true"));
boolean includeQuote =
Boolean.parseBoolean(cmd.getOptionValue(includeQuoteOption.getOpt(), "true"));

List<InfoType> infoTypesList = Collections.emptyList();
if (cmd.hasOption(infoTypesOption.getOpt())) {
Expand All @@ -437,8 +434,9 @@ public static void main(String[] args) throws Exception {
String namespaceId = cmd.getOptionValue(datastoreNamespaceOption.getOpt(), "");
String kind = cmd.getOptionValue(datastoreKindOption.getOpt());
// use default project id when project id is not specified
String projectId = cmd.getOptionValue(datastoreProjectIdOption.getOpt(),
ServiceOptions.getDefaultProjectId());
String projectId =
cmd.getOptionValue(
datastoreProjectIdOption.getOpt(), ServiceOptions.getDefaultProjectId());
inspectDatastore(projectId, namespaceId, kind, minLikelihood, infoTypesList);
}
}
Expand Down
Loading